diff --git a/.eslintrc.js b/.eslintrc.js
index 22b94d79e369..ac4546567833 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -164,7 +164,7 @@ module.exports = {
             },
         },
         {
-            files: ['tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
+            files: ['workflow_tests/**/*.{js,jsx,ts,tsx}', 'tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
             rules: {
                 '@lwc/lwc/no-async-await': 'off',
                 'no-await-in-loop': 'off',
diff --git a/.github/ISSUE_TEMPLATE/DesignDoc.md b/.github/ISSUE_TEMPLATE/DesignDoc.md
index 424b549a0940..2fbdcf7a65d5 100644
--- a/.github/ISSUE_TEMPLATE/DesignDoc.md
+++ b/.github/ISSUE_TEMPLATE/DesignDoc.md
@@ -27,6 +27,7 @@ labels: Daily, NewFeature
 - [ ] Confirm that the doc has the minimum necessary number of reviews before proceeding
 - [ ] Email `strategy@expensify.com` one last time to let them know the Design Doc is moving into the implementation phase
 - [ ] Implement the changes
+- [ ] Add regression tests so that QA can test your feature with every deploy ([instructions](https://stackoverflowteams.com/c/expensify/questions/363))
 - [ ] Send out a follow up email to `strategy@expensify.com` once everything has been implemented and do a **Project Wrap-Up** retrospective that provides:
     - Summary of what we accomplished with this project
     - What went well?
diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
index ffaa55c0b3be..57c7e4d91379 100644
--- a/.github/actions/composite/setupNode/action.yml
+++ b/.github/actions/composite/setupNode/action.yml
@@ -16,38 +16,13 @@ runs:
       uses: actions/cache@v3
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
       uses: actions/cache@v3
       with:
         path: desktop/node_modules
-        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
-
-    - name: Check if patch files changed
-      id: patchCheck
-      shell: bash
-      run: |
-        set -e
-        if [[ `git diff main --name-only | grep \.patch` != null ]]; then 
-          echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
-        else 
-          echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
-        fi
-
-    - name: Patch root project node packages
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-node-modules.outputs.cache-hit == 'true'
-      run: npx patch-package
-
-    - name: Patch node packages for desktop submodule
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
-      run: cd desktop && npx patch-package
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
 
     - name: Install root project node packages
       if: steps.cache-node-modules.outputs.cache-hit != 'true'
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
index 701a9bca70a7..561b8e61bc21 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -207,10 +207,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -301,13 +298,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index def58d95e846..e42f97508bc5 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -170,10 +170,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -264,13 +261,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 57c59c88f9e5..80f75137bb71 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -9,17 +9,12 @@ module.exports =
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const _ = __nccwpck_require__(2947);
-const lodashGet = __nccwpck_require__(6908);
 const core = __nccwpck_require__(2186);
 const {context} = __nccwpck_require__(5438);
 const CONST = __nccwpck_require__(4097);
 const ActionUtils = __nccwpck_require__(970);
 const GithubUtils = __nccwpck_require__(7999);
 
-const prList = ActionUtils.getJSONInput('PR_LIST', {required: true});
-const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true});
-const version = core.getInput('DEPLOY_VERSION', {required: true});
-
 /**
  * Return a nicely formatted message for the table based on the result of the GitHub action job
  *
@@ -40,34 +35,6 @@ function getDeployTableMessage(platformResult) {
     }
 }
 
-const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}));
-const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}));
-const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}));
-const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}));
-
-const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
-
-/**
- * @param {String} deployer
- * @param {String} deployVerb
- * @param {String} prTitle
- * @returns {String}
- */
-function getDeployMessage(deployer, deployVerb, prTitle) {
-    let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
-    message += ` by https://github.com/${deployer} in version: ${version} 🚀`;
-    message += `\n\n platform | result \n ---|--- \n🤖 android 🤖|${androidResult} \n🖥 desktop 🖥|${desktopResult}`;
-    message += `\n🍎 iOS 🍎|${iOSResult} \n🕸 web 🕸|${webResult}`;
-
-    if (deployVerb === 'Cherry-picked' && !/no qa/gi.test(prTitle)) {
-        // eslint-disable-next-line max-len
-        message +=
-            '\n\n@Expensify/applauseleads please QA this PR and check it off on the [deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) if it passes.';
-    }
-
-    return message;
-}
-
 /**
  * Comment Single PR
  *
@@ -75,87 +42,108 @@ function getDeployMessage(deployer, deployVerb, prTitle) {
  * @param {String} message
  * @returns {Promise<void>}
  */
-function commentPR(PR, message) {
-    return GithubUtils.createComment(context.repo.repo, PR, message)
-        .then(() => console.log(`Comment created on #${PR} successfully 🎉`))
-        .catch((err) => {
-            console.log(`Unable to write comment on #${PR} 😞`);
-            core.setFailed(err.message);
-        });
+async function commentPR(PR, message) {
+    try {
+        await GithubUtils.createComment(context.repo.repo, PR, message);
+        console.log(`Comment created on #${PR} successfully 🎉`);
+    } catch (err) {
+        console.log(`Unable to write comment on #${PR} 😞`);
+        core.setFailed(err.message);
+    }
 }
 
-const run = function () {
+const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+
+async function run() {
+    const prList = _.map(ActionUtils.getJSONInput('PR_LIST', {required: true}), (num) => Number.parseInt(num, 10));
+    const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true});
+    const version = core.getInput('DEPLOY_VERSION', {required: true});
+
+    const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}));
+    const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}));
+    const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}));
+    const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}));
+
+    /**
+     * @param {String} deployer
+     * @param {String} deployVerb
+     * @param {String} prTitle
+     * @returns {String}
+     */
+    function getDeployMessage(deployer, deployVerb, prTitle) {
+        let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
+        message += ` by https://github.com/${deployer} in version: ${version} 🚀`;
+        message += `\n\nplatform | result\n---|---\n🤖 android 🤖|${androidResult}\n🖥 desktop 🖥|${desktopResult}`;
+        message += `\n🍎 iOS 🍎|${iOSResult}\n🕸 web 🕸|${webResult}`;
+
+        if (deployVerb === 'Cherry-picked' && !/no ?qa/gi.test(prTitle)) {
+            // eslint-disable-next-line max-len
+            message +=
+                '\n\n@Expensify/applauseleads please QA this PR and check it off on the [deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) if it passes.';
+        }
+
+        return message;
+    }
+
     if (isProd) {
-        // First find the deployer (who closed the last deploy checklist)?
-        return GithubUtils.octokit.issues
-            .listForRepo({
-                owner: CONST.GITHUB_OWNER,
-                repo: CONST.APP_REPO,
-                labels: CONST.LABELS.STAGING_DEPLOY,
-                state: 'closed',
-            })
-            .then(({data}) => _.first(data).number)
-            .then((lastDeployChecklistNumber) => GithubUtils.getActorWhoClosedIssue(lastDeployChecklistNumber))
-            .then((actor) => {
-                // Create comment on each pull request (one after another to avoid throttling issues)
-                const deployMessage = getDeployMessage(actor, 'Deployed');
-                _.reduce(prList, (promise, pr) => promise.then(() => commentPR(pr, deployMessage)), Promise.resolve());
-            });
+        // Find the previous deploy checklist
+        const {data: deployChecklists} = await GithubUtils.octokit.issues.listForRepo({
+            owner: CONST.GITHUB_OWNER,
+            repo: CONST.APP_REPO,
+            labels: CONST.LABELS.STAGING_DEPLOY,
+            state: 'closed',
+        });
+        const previousChecklistID = _.first(deployChecklists).number;
+
+        // who closed the last deploy checklist?
+        const deployer = await GithubUtils.getActorWhoClosedIssue(previousChecklistID);
+
+        // Create comment on each pull request (one at a time to avoid throttling issues)
+        const deployMessage = getDeployMessage(deployer, 'Deployed');
+        for (const pr of prList) {
+            await commentPR(pr, deployMessage);
+        }
+        return;
     }
 
     // First find out if this is a normal staging deploy or a CP by looking at the commit message on the tag
-    return GithubUtils.octokit.repos
-        .listTags({
+    const {data: recentTags} = await GithubUtils.octokit.repos.listTags({
+        owner: CONST.GITHUB_OWNER,
+        repo: CONST.APP_REPO,
+        per_page: 100,
+    });
+    const currentTag = _.find(recentTags, (tag) => tag.name === version);
+    if (!currentTag) {
+        const err = `Could not find tag matching ${version}`;
+        console.error(err);
+        core.setFailed(err);
+        return;
+    }
+    const {data: commit} = await GithubUtils.octokit.git.getCommit({
+        owner: CONST.GITHUB_OWNER,
+        repo: CONST.APP_REPO,
+        commit_sha: currentTag.commit.sha,
+    });
+    const isCP = /[\S\s]*\(cherry picked from commit .*\)/.test(commit.message);
+
+    for (const prNumber of prList) {
+        /*
+         * Determine who the deployer for the PR is. The "deployer" for staging deploys is:
+         *   1. For regular staging deploys, the person who merged the PR.
+         *   2. For CPs, the person who committed the cherry-picked commit (not necessarily the author of the commit).
+         */
+        const {data: pr} = await GithubUtils.octokit.pulls.get({
             owner: CONST.GITHUB_OWNER,
             repo: CONST.APP_REPO,
-            per_page: 100,
-        })
-        .then(({data}) => {
-            const tagSHA = _.find(data, (tag) => tag.name === version).commit.sha;
-            return GithubUtils.octokit.git.getCommit({
-                owner: CONST.GITHUB_OWNER,
-                repo: CONST.APP_REPO,
-                commit_sha: tagSHA,
-            });
-        })
-        .then(({data}) => {
-            const isCP = /Merge pull request #\d+ from Expensify\/.*-?cherry-pick-staging-\d+/.test(data.message);
-            _.reduce(
-                prList,
-                (promise, PR) =>
-                    promise
-
-                        // Then, for each PR, find out who merged it and determine the deployer
-                        .then(() =>
-                            GithubUtils.octokit.pulls.get({
-                                owner: CONST.GITHUB_OWNER,
-                                repo: CONST.APP_REPO,
-                                pull_number: PR,
-                            }),
-                        )
-                        .then((response) => {
-                            /*
-                             * The deployer for staging deploys is:
-                             *   1. For regular staging deploys, the person who merged the PR.
-                             *   2. For automatic CPs (using the label), the person who merged the PR.
-                             *   3. For manual CPs (using the GH UI), the person who triggered the workflow
-                             *      (reflected in the branch name).
-                             */
-                            let deployer = lodashGet(response, 'data.merged_by.login', '');
-                            const issueTitle = lodashGet(response, 'data.title', '');
-                            const CPActorMatches = data.message.match(/Merge pull request #\d+ from Expensify\/(.+)-cherry-pick-staging-\d+/);
-                            if (_.isArray(CPActorMatches) && CPActorMatches.length === 2 && CPActorMatches[1] !== CONST.OS_BOTIFY) {
-                                deployer = CPActorMatches[1];
-                            }
-
-                            // Finally, comment on the PR
-                            const deployMessage = getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', issueTitle);
-                            return commentPR(PR, deployMessage);
-                        }),
-                Promise.resolve(),
-            );
+            pull_number: prNumber,
         });
-};
+        const deployer = isCP ? commit.committer.name : pr.merged_by.login;
+
+        const title = pr.title;
+        const deployMessage = getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title);
+        await commentPR(prNumber, deployMessage);
+    }
+}
 
 if (require.main === require.cache[eval('__filename')]) {
     run();
@@ -8171,7 +8159,7 @@ var modules = [
     __nccwpck_require__(9557),
     __nccwpck_require__(1155),
     __nccwpck_require__(1644),
-    __nccwpck_require__(373),
+    __nccwpck_require__(6657),
     __nccwpck_require__(1080),
     __nccwpck_require__(1012),
     __nccwpck_require__(9695),
@@ -8395,7 +8383,7 @@ InternalDecoderCesu8.prototype.end = function() {
 
 /***/ }),
 
-/***/ 373:
+/***/ 6657:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -10455,7 +10443,7 @@ module.exports = Map;
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 var mapCacheClear = __nccwpck_require__(1610),
-    mapCacheDelete = __nccwpck_require__(6657),
+    mapCacheDelete = __nccwpck_require__(5991),
     mapCacheGet = __nccwpck_require__(1372),
     mapCacheHas = __nccwpck_require__(609),
     mapCacheSet = __nccwpck_require__(5582);
@@ -11297,7 +11285,7 @@ module.exports = mapCacheClear;
 
 /***/ }),
 
-/***/ 6657:
+/***/ 5991:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 var getMapData = __nccwpck_require__(9980);
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
index 708d001892c2..d03a947cdec8 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
@@ -1,15 +1,10 @@
 const _ = require('underscore');
-const lodashGet = require('lodash/get');
 const core = require('@actions/core');
 const {context} = require('@actions/github');
 const CONST = require('../../../libs/CONST');
 const ActionUtils = require('../../../libs/ActionUtils');
 const GithubUtils = require('../../../libs/GithubUtils');
 
-const prList = ActionUtils.getJSONInput('PR_LIST', {required: true});
-const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true});
-const version = core.getInput('DEPLOY_VERSION', {required: true});
-
 /**
  * Return a nicely formatted message for the table based on the result of the GitHub action job
  *
@@ -30,34 +25,6 @@ function getDeployTableMessage(platformResult) {
     }
 }
 
-const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}));
-const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}));
-const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}));
-const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}));
-
-const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
-
-/**
- * @param {String} deployer
- * @param {String} deployVerb
- * @param {String} prTitle
- * @returns {String}
- */
-function getDeployMessage(deployer, deployVerb, prTitle) {
-    let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
-    message += ` by https://github.com/${deployer} in version: ${version} 🚀`;
-    message += `\n\n platform | result \n ---|--- \n🤖 android 🤖|${androidResult} \n🖥 desktop 🖥|${desktopResult}`;
-    message += `\n🍎 iOS 🍎|${iOSResult} \n🕸 web 🕸|${webResult}`;
-
-    if (deployVerb === 'Cherry-picked' && !/no qa/gi.test(prTitle)) {
-        // eslint-disable-next-line max-len
-        message +=
-            '\n\n@Expensify/applauseleads please QA this PR and check it off on the [deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) if it passes.';
-    }
-
-    return message;
-}
-
 /**
  * Comment Single PR
  *
@@ -65,87 +32,108 @@ function getDeployMessage(deployer, deployVerb, prTitle) {
  * @param {String} message
  * @returns {Promise<void>}
  */
-function commentPR(PR, message) {
-    return GithubUtils.createComment(context.repo.repo, PR, message)
-        .then(() => console.log(`Comment created on #${PR} successfully 🎉`))
-        .catch((err) => {
-            console.log(`Unable to write comment on #${PR} 😞`);
-            core.setFailed(err.message);
-        });
+async function commentPR(PR, message) {
+    try {
+        await GithubUtils.createComment(context.repo.repo, PR, message);
+        console.log(`Comment created on #${PR} successfully 🎉`);
+    } catch (err) {
+        console.log(`Unable to write comment on #${PR} 😞`);
+        core.setFailed(err.message);
+    }
 }
 
-const run = function () {
+const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+
+async function run() {
+    const prList = _.map(ActionUtils.getJSONInput('PR_LIST', {required: true}), (num) => Number.parseInt(num, 10));
+    const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true});
+    const version = core.getInput('DEPLOY_VERSION', {required: true});
+
+    const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}));
+    const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}));
+    const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}));
+    const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}));
+
+    /**
+     * @param {String} deployer
+     * @param {String} deployVerb
+     * @param {String} prTitle
+     * @returns {String}
+     */
+    function getDeployMessage(deployer, deployVerb, prTitle) {
+        let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
+        message += ` by https://github.com/${deployer} in version: ${version} 🚀`;
+        message += `\n\nplatform | result\n---|---\n🤖 android 🤖|${androidResult}\n🖥 desktop 🖥|${desktopResult}`;
+        message += `\n🍎 iOS 🍎|${iOSResult}\n🕸 web 🕸|${webResult}`;
+
+        if (deployVerb === 'Cherry-picked' && !/no ?qa/gi.test(prTitle)) {
+            // eslint-disable-next-line max-len
+            message +=
+                '\n\n@Expensify/applauseleads please QA this PR and check it off on the [deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) if it passes.';
+        }
+
+        return message;
+    }
+
     if (isProd) {
-        // First find the deployer (who closed the last deploy checklist)?
-        return GithubUtils.octokit.issues
-            .listForRepo({
-                owner: CONST.GITHUB_OWNER,
-                repo: CONST.APP_REPO,
-                labels: CONST.LABELS.STAGING_DEPLOY,
-                state: 'closed',
-            })
-            .then(({data}) => _.first(data).number)
-            .then((lastDeployChecklistNumber) => GithubUtils.getActorWhoClosedIssue(lastDeployChecklistNumber))
-            .then((actor) => {
-                // Create comment on each pull request (one after another to avoid throttling issues)
-                const deployMessage = getDeployMessage(actor, 'Deployed');
-                _.reduce(prList, (promise, pr) => promise.then(() => commentPR(pr, deployMessage)), Promise.resolve());
-            });
+        // Find the previous deploy checklist
+        const {data: deployChecklists} = await GithubUtils.octokit.issues.listForRepo({
+            owner: CONST.GITHUB_OWNER,
+            repo: CONST.APP_REPO,
+            labels: CONST.LABELS.STAGING_DEPLOY,
+            state: 'closed',
+        });
+        const previousChecklistID = _.first(deployChecklists).number;
+
+        // who closed the last deploy checklist?
+        const deployer = await GithubUtils.getActorWhoClosedIssue(previousChecklistID);
+
+        // Create comment on each pull request (one at a time to avoid throttling issues)
+        const deployMessage = getDeployMessage(deployer, 'Deployed');
+        for (const pr of prList) {
+            await commentPR(pr, deployMessage);
+        }
+        return;
     }
 
     // First find out if this is a normal staging deploy or a CP by looking at the commit message on the tag
-    return GithubUtils.octokit.repos
-        .listTags({
+    const {data: recentTags} = await GithubUtils.octokit.repos.listTags({
+        owner: CONST.GITHUB_OWNER,
+        repo: CONST.APP_REPO,
+        per_page: 100,
+    });
+    const currentTag = _.find(recentTags, (tag) => tag.name === version);
+    if (!currentTag) {
+        const err = `Could not find tag matching ${version}`;
+        console.error(err);
+        core.setFailed(err);
+        return;
+    }
+    const {data: commit} = await GithubUtils.octokit.git.getCommit({
+        owner: CONST.GITHUB_OWNER,
+        repo: CONST.APP_REPO,
+        commit_sha: currentTag.commit.sha,
+    });
+    const isCP = /[\S\s]*\(cherry picked from commit .*\)/.test(commit.message);
+
+    for (const prNumber of prList) {
+        /*
+         * Determine who the deployer for the PR is. The "deployer" for staging deploys is:
+         *   1. For regular staging deploys, the person who merged the PR.
+         *   2. For CPs, the person who committed the cherry-picked commit (not necessarily the author of the commit).
+         */
+        const {data: pr} = await GithubUtils.octokit.pulls.get({
             owner: CONST.GITHUB_OWNER,
             repo: CONST.APP_REPO,
-            per_page: 100,
-        })
-        .then(({data}) => {
-            const tagSHA = _.find(data, (tag) => tag.name === version).commit.sha;
-            return GithubUtils.octokit.git.getCommit({
-                owner: CONST.GITHUB_OWNER,
-                repo: CONST.APP_REPO,
-                commit_sha: tagSHA,
-            });
-        })
-        .then(({data}) => {
-            const isCP = /Merge pull request #\d+ from Expensify\/.*-?cherry-pick-staging-\d+/.test(data.message);
-            _.reduce(
-                prList,
-                (promise, PR) =>
-                    promise
-
-                        // Then, for each PR, find out who merged it and determine the deployer
-                        .then(() =>
-                            GithubUtils.octokit.pulls.get({
-                                owner: CONST.GITHUB_OWNER,
-                                repo: CONST.APP_REPO,
-                                pull_number: PR,
-                            }),
-                        )
-                        .then((response) => {
-                            /*
-                             * The deployer for staging deploys is:
-                             *   1. For regular staging deploys, the person who merged the PR.
-                             *   2. For automatic CPs (using the label), the person who merged the PR.
-                             *   3. For manual CPs (using the GH UI), the person who triggered the workflow
-                             *      (reflected in the branch name).
-                             */
-                            let deployer = lodashGet(response, 'data.merged_by.login', '');
-                            const issueTitle = lodashGet(response, 'data.title', '');
-                            const CPActorMatches = data.message.match(/Merge pull request #\d+ from Expensify\/(.+)-cherry-pick-staging-\d+/);
-                            if (_.isArray(CPActorMatches) && CPActorMatches.length === 2 && CPActorMatches[1] !== CONST.OS_BOTIFY) {
-                                deployer = CPActorMatches[1];
-                            }
-
-                            // Finally, comment on the PR
-                            const deployMessage = getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', issueTitle);
-                            return commentPR(PR, deployMessage);
-                        }),
-                Promise.resolve(),
-            );
+            pull_number: prNumber,
         });
-};
+        const deployer = isCP ? commit.committer.name : pr.merged_by.login;
+
+        const title = pr.title;
+        const deployMessage = getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title);
+        await commentPR(prNumber, deployMessage);
+    }
+}
 
 if (require.main === module) {
     run();
diff --git a/.github/libs/GitUtils.js b/.github/libs/GitUtils.js
index ba9d7fa2b38a..7bc600470dd1 100644
--- a/.github/libs/GitUtils.js
+++ b/.github/libs/GitUtils.js
@@ -22,10 +22,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -116,13 +113,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 
diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh
index 3a57a736cd70..ec2709a25786 100755
--- a/.github/scripts/verifyPodfile.sh
+++ b/.github/scripts/verifyPodfile.sh
@@ -13,10 +13,10 @@ declare EXIT_CODE=0
 # Check Provisioning Style. If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified
 info "Verifying that automatic signing is not enabled"
 if grep -q 'PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore' ios/NewExpensify.xcodeproj/project.pbxproj; then
-    success "Automatic signing not enabled"
+  success "Automatic signing not enabled"
 else
-    error "Error: Automatic provisioning style is not allowed!"
-    EXIT_CODE=1
+  error "Error: Automatic provisioning style is not allowed!"
+  EXIT_CODE=1
 fi
 
 PODFILE_SHA=$(openssl sha1 ios/Podfile | awk '{print $2}')
@@ -26,10 +26,26 @@ echo "Podfile: $PODFILE_SHA"
 echo "Podfile.lock: $PODFILE_LOCK_SHA"
 
 if [[ "$PODFILE_SHA" == "$PODFILE_LOCK_SHA" ]]; then
-    success "Podfile checksum verified!"
+  success "Podfile checksum verified!"
 else
-    error "Podfile.lock checksum mismatch. Did you forget to run \`npx pod-install\`?"
-    EXIT_CODE=1
+  error "Podfile.lock checksum mismatch. Did you forget to run \`npx pod-install\`?"
+  EXIT_CODE=1
+fi
+
+info "Ensuring correct version of cocoapods is used..."
+
+POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+)(\.[[:digit:]]+)?';
+POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"~> $POD_VERSION_REGEX\"/\1/p" Gemfile)"
+info "Pod version from Gemfile: $POD_VERSION_FROM_GEMFILE"
+
+POD_VERSION_FROM_PODFILE_LOCK="$(sed -nr "s/COCOAPODS: $POD_VERSION_REGEX/\1/p" ios/Podfile.lock)"
+info "Pod version from Podfile.lock: $POD_VERSION_FROM_PODFILE_LOCK"
+
+if [[ "$POD_VERSION_FROM_GEMFILE" == "$POD_VERSION_FROM_PODFILE_LOCK" ]]; then
+  success "Cocoapods version from Podfile.lock matches cocoapods version from Gemfile"
+else
+  error "Cocoapods version from Podfile.lock does not match cocoapods version from Gemfile. Please use \`npm run pod-install\` or \`bundle exec pod install\` instead of \`pod install\` to install pods."
+  EXIT_CODE=1
 fi
 
 info "Comparing Podfile.lock with node packages..."
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index e1b1696411b1..e432d9291f45 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -85,7 +85,7 @@ The GitHub workflows require a large list of secrets to deploy, notify and test
 1. `LARGE_SECRET_PASSPHRASE` - decrypts secrets stored in various encrypted files stored in GitHub repository. To create updated versions of these encrypted files, refer to steps 1-4 of [this encrypted secrets help page](https://docs.github.com/en/actions/reference/encrypted-secrets#limits-for-secrets) using the `LARGE_SECRET_PASSPHRASE`.
    1. `android/app/my-upload-key.keystore.gpg`
    1. `android/app/android-fastlane-json-key.json.gpg`
-   1. `ios/chat_expensify_adhoc.mobileprovision.gpg`
+   1. `ios/expensify_chat_adhoc.mobileprovision.gpg`
    1. `ios/chat_expensify_appstore.mobileprovision.gpg`
    1. `ios/Certificates.p12.gpg`
 1. `SLACK_WEBHOOK` - Sends Slack notifications via Slack WebHook https://expensify.slack.com/services/B01AX48D7MM
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index d4c17a734b1c..b6558b049647 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -13,7 +13,8 @@ jobs:
     outputs:
       IS_DEPLOYER: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
     steps:
-      - id: isDeployer
+      - name: Check if user is deployer
+        id: isDeployer
         run: |
           if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
             echo "IS_DEPLOYER=true" >> "$GITHUB_OUTPUT"
@@ -39,7 +40,8 @@ jobs:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Set up git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -77,6 +79,7 @@ jobs:
         id: cherryPick
         run: |
           echo "Attempting to cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}"
+          git config user.name ${{ github.actor }}
           if git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then
             echo "🎉 No conflicts! CP was a success, PR can be automerged 🎉"
             echo "HAS_CONFLICTS=false" >> "$GITHUB_OUTPUT"
@@ -87,6 +90,7 @@ jobs:
             GIT_MERGE_AUTOEDIT=no git cherry-pick --continue
             echo "HAS_CONFLICTS=true" >> "$GITHUB_OUTPUT"
           fi
+          git config user.name OSBotify
 
       - name: Push changes
         run: |
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 8943669c2ba8..54ae1048b57b 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -13,18 +13,20 @@ jobs:
     # It does not run for pull requests created by OSBotify
     if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify') }}
     steps:
-        - uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
+        - name: CLA comment check
+          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
           id: sign
           with:
             text: ${{ github.event.comment.body }}
             regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
+        - name: CLA comment re-check
+          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
           id: recheck
           with:
             text: ${{ github.event.comment.body }}
             regex: '\s*recheck\s*'
         - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' }} || github.event_name == 'pull_request_target'
+          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
           # Version: 2.1.2-beta
           uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
           env:
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index b2703731df79..ba907334c595 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -54,18 +54,21 @@ jobs:
       NEW_VERSION: ${{ steps.bumpVersion.outputs.NEW_VERSION }}
 
     steps:
-      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+      - name: Run turnstyle
+        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - uses: actions/checkout@v3
+      - name: Check out
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -89,7 +92,8 @@ jobs:
       - name: Update main branch
         run: git push origin main
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b3105ee05c2c..f2ff67680940 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,8 @@ jobs:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -29,12 +30,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/production'
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: production
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml
index 8065a5c88cb2..f42d19ca8241 100644
--- a/.github/workflows/deployBlocker.yml
+++ b/.github/workflows/deployBlocker.yml
@@ -11,7 +11,8 @@ jobs:
     if: ${{ github.event.label.name == 'DeployBlockerCash' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -63,7 +64,8 @@ jobs:
               2. Find someone who can quickly fix the issue.
               3. Fix the issue yourself.
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
index b78a5fac4b69..e2323af2486e 100644
--- a/.github/workflows/finishReleaseCycle.yml
+++ b/.github/workflows/finishReleaseCycle.yml
@@ -23,7 +23,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - name: Reopen and comment on issue
+      - name: Reopen and comment on issue (not a team member)
         if: ${{ !fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
@@ -41,8 +41,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
-      - name: Reopen and comment on issue
-        if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS) }}
+      - name: Reopen and comment on issue (has blockers)
+        if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS || 'false') }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -51,7 +51,8 @@ jobs:
             This issue either has unchecked items or has not yet been marked with the `:shipit:` emoji of approval.
             Reopening!
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -62,12 +63,14 @@ jobs:
     needs: validate
     if: ${{ fromJSON(needs.validate.outputs.isValid) }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -79,7 +82,8 @@ jobs:
           # Force-update the remote production branch.
           git push --force origin production
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -98,12 +102,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: [updateProduction, createNewPatchVersion]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -115,35 +121,8 @@ jobs:
           # Force-update the remote staging branch
           git push --force origin staging
 
-      - if: ${{ failure() }}
-        uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
-        with:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-  # Create a new StagingDeployCash for the next release cycle.
-  createNewStagingDeployCash:
-    runs-on: ubuntu-latest
-    needs: [updateStaging, createNewPatchVersion]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: staging
-          token: ${{ secrets.OS_BOTIFY_TOKEN }}
-
-        # Create a local git tag so that GitUtils.getPullRequestsMergedBetween can use `git log` to generate a
-        # list of pull requests that were merged between this version tag and another.
-        # NOTE: This tag is only used locally and shouldn't be pushed to the remote.
-        # If it was pushed, that would trigger the staging deploy which is handled in a separate workflow (deploy.yml)
-      - name: Tag version
-        run: git tag ${{ needs.createNewPatchVersion.outputs.NEW_VERSION }}
-
-      - name: Create new StagingDeployCash
-        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-          NPM_VERSION: ${{ needs.createNewPatchVersion.outputs.NEW_VERSION }}
-
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 795271cab60a..5953a4aa89e2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,11 +11,13 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - name: Lint JavaScript with ESLint
+      - name: Lint JavaScript and Typescript with ESLint
         run: npm run lint
         env:
           CI: true
diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml
index a49a5519f690..6ca025bb2a25 100644
--- a/.github/workflows/lockDeploys.yml
+++ b/.github/workflows/lockDeploys.yml
@@ -9,7 +9,8 @@ jobs:
     if: ${{ github.event.label.name == '🔐 LockCashDeploys 🔐' && contains(github.event.issue.labels.*.name, 'StagingDeployCash') && github.actor != 'OSBotify' }}
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -27,7 +28,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 84f8373ff247..ad002e164837 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -18,7 +18,8 @@ jobs:
     outputs:
       IS_DEPLOYER: ${{ fromJSON(steps.isUserDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
     steps:
-      - id: isUserDeployer
+      - name: Check if user is deployer
+        id: isUserDeployer
         run: |
           if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
             echo "IS_DEPLOYER=true" >> "$GITHUB_OUTPUT"
@@ -28,20 +29,45 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
+  # Note: we're updating the checklist before running the deploys and assuming that it will succeed on at least one platform
+  deployChecklist:
+    name: Create or update deploy checklist
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'release' }}
+    needs: validateActor
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
+
+      - name: Set version
+        id: getVersion
+        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_OUTPUT"
+
+      - name: Create or update staging deploy
+        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          NPM_VERSION: ${{ steps.getVersion.outputs.VERSION }}
+
   android:
     name: Build and deploy Android
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -108,9 +134,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
         run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg
@@ -145,20 +173,36 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
 
+      - name: Cache Pod dependencies
+        uses: actions/cache@v3
+        id: pods-cache
+        with:
+          path: ios/Pods
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock') }}
+          restore-keys: ${{ runner.os }}-pods-cache-
+
+      - name: Compare Podfile.lock and Manifest.lock
+        id: compare-podfile-and-manifest
+        run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
+
       - name: Install cocoapods
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5
@@ -234,9 +278,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Cloudflare CLI
         run: pip3 install cloudflare
@@ -291,7 +337,8 @@ jobs:
     if: ${{ failure() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
+      - name: Post Slack message on failure
+        uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
@@ -301,7 +348,8 @@ jobs:
     if: ${{ success() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
@@ -361,9 +409,11 @@ jobs:
     if: ${{ always() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
index c9fb636238aa..186490c7baaf 100644
--- a/.github/workflows/preDeploy.yml
+++ b/.github/workflows/preDeploy.yml
@@ -2,7 +2,8 @@ name: Process new code merged to main
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   typecheck:
@@ -20,12 +21,14 @@ jobs:
     if: ${{ always() }}
 
     steps:
-      - if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+      - name: Announce failed workflow in Slack
+        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
-      - if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+      - name: Exit failed workflow
+        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         run: exit 1
 
   chooseDeployActions:
@@ -33,7 +36,7 @@ jobs:
     needs: confirmPassingBuild
     outputs:
       MERGED_PR: ${{ steps.getMergedPullRequest.outputs.number }}
-      SHOULD_DEPLOY: ${{ steps.shouldDeploy.outputs.SHOULD_DEPLOY }}
+      SHOULD_DEPLOY: ${{ fromJSON(steps.shouldDeploy.outputs.SHOULD_DEPLOY) }}
 
     steps:
       - name: Get merged pull request
@@ -75,18 +78,21 @@ jobs:
     needs: [chooseDeployActions, createNewVersion]
     runs-on: ubuntu-latest
     steps:
-      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+      - name: Run turnstyle
+        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - uses: actions/checkout@v3
+      - name: Checkout main
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -98,26 +104,8 @@ jobs:
           # Force-update the remote staging branch
           git push --force origin staging
 
-      # Create a local git tag on staging so that GitUtils.getPullRequestsMergedBetween can use `git log` to generate a
-      # list of pull requests that were merged between this version tag and another.
-      # NOTE: This tag is only used locally and shouldn't be pushed to the remote.
-      # If it was pushed, that would trigger the staging deploy which is handled in a separate workflow (deploy.yml)
-      - name: Tag staging
-        run: git tag ${{ needs.createNewVersion.outputs.NEW_VERSION }}
-
-      - name: Update StagingDeployCash
-        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-          NPM_VERSION: ${{ needs.createNewVersion.outputs.NEW_VERSION }}
-
-      - name: Find open StagingDeployCash
-        id: getStagingDeployCash
-        run: echo "STAGING_DEPLOY_CASH=$(gh issue list --label StagingDeployCash --json number --jq '.[0].number')" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -153,7 +141,8 @@ jobs:
     if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }}
     steps:
       # Version: 2.3.4
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e79a02281ae0..72bdd0468fd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,11 @@ jobs:
         chunk: [ 1, 2, 3 ]
     name: test (job ${{ fromJSON(matrix.chunk) }})
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Get number of CPU cores
         id: cpu-cores
@@ -53,9 +55,11 @@ jobs:
     runs-on: ubuntu-latest
     name: Shell tests
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Test CI git logic
         run: tests/unit/CIGitLogicTest.sh
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 16fffcc2c65e..6ded44d7059f 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -19,7 +19,8 @@ jobs:
     outputs:
       READY_TO_BUILD: ${{ fromJSON(steps.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && fromJSON(steps.hasReadyToBuildLabel.outputs.HAS_READY_TO_BUILD_LABEL) }}
     steps:
-      - id: isExpensifyEmployee
+      - name: Is Expensify employee
+        id: isExpensifyEmployee
         run: |
           if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ github.actor }} --silent; then
             echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
@@ -70,7 +71,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -80,9 +82,11 @@ jobs:
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -117,7 +121,8 @@ jobs:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
         with:
           name: android
           path: ./android_paths.json
@@ -131,7 +136,8 @@ jobs:
     runs-on: macos-12-xl
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -144,18 +150,33 @@ jobs:
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - name: Setup Xcode
+      - name: Setup XCode
         run: sudo xcode-select -switch /Applications/Xcode_14.2.app
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
 
+      - name: Cache Pod dependencies
+        uses: actions/cache@v3
+        id: pods-cache
+        with:
+          path: ios/Pods
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock') }}
+          restore-keys: ${{ runner.os }}-pods-cache-
+
+      - name: Compare Podfile.lock and Manifest.lock
+        id: compare-podfile-and-manifest
+        run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
+
       - name: Install cocoapods
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5
@@ -185,7 +206,8 @@ jobs:
           S3_BUCKET: ad-hoc-expensify-cash
           S3_REGION: us-east-1
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
         with:
           name: ios
           path: ./ios_paths.json
@@ -198,7 +220,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -208,7 +231,8 @@ jobs:
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
         run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg
@@ -239,7 +263,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -249,7 +274,8 @@ jobs:
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Configure AWS Credentials
         uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main
@@ -270,7 +296,7 @@ jobs:
   postGithubComment:
     runs-on: ubuntu-latest
     name: Post a GitHub comment with app download links for testing
-    needs: [validateActor, getBranchRef, android, ios, desktop, web]
+    needs: [validateActor, getBranchRef, android, iOS, desktop, web]
     if: ${{ always() }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
@@ -281,7 +307,8 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
-      - uses: actions/download-artifact@v3
+      - name: Download Artifact
+        uses: actions/download-artifact@v3
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
 
       - name: Read JSONs with android paths
@@ -297,7 +324,7 @@ jobs:
 
       - name: Read JSONs with iOS paths
         id: get_ios_path
-        if: ${{ needs.ios.result == 'success' }}
+        if: ${{ needs.iOS.result == 'success' }}
         run: |
           content_ios="$(cat ./ios/ios_paths.json)"
           content_ios="${content_ios//'%'/'%25'}"
diff --git a/.github/workflows/validateGithubActions.yml b/.github/workflows/validateGithubActions.yml
index f496c5e4b27e..bcda941e1b05 100644
--- a/.github/workflows/validateGithubActions.yml
+++ b/.github/workflows/validateGithubActions.yml
@@ -12,9 +12,11 @@ jobs:
     if: github.actor != 'OSBotify'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       # Rebuild all the actions on this branch and check for a diff. Fail if there is one,
       # because that would be a sign that the PR author did not rebuild the Github Actions
diff --git a/.github/workflows/verifyPodfile.yml b/.github/workflows/verifyPodfile.yml
index 64188769f0bd..d8d931e476d1 100644
--- a/.github/workflows/verifyPodfile.yml
+++ b/.github/workflows/verifyPodfile.yml
@@ -14,8 +14,9 @@ jobs:
     if: github.actor != 'OSBotify'
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
-
-      - run: ./.github/scripts/verifyPodfile.sh
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Verify podfile
+        run: ./.github/scripts/verifyPodfile.sh
diff --git a/.github/workflows/verifySignedCommits.yml b/.github/workflows/verifySignedCommits.yml
index e1068e71e041..ee1b0c4c78da 100644
--- a/.github/workflows/verifySignedCommits.yml
+++ b/.github/workflows/verifySignedCommits.yml
@@ -9,6 +9,7 @@ jobs:
   verifySignedCommits:
     runs-on: ubuntu-latest
     steps:
-      - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main
+      - name: Verify signed commits
+        uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main
         with:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
index 4919ddc1fdc9..aae9baad529f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,9 @@ tests/e2e/results/
 
 # Typescript
 tsconfig.tsbuildinfo
+
+# Mock-github
+/repo/
+
+# Workflow test logs
+/workflow_tests/logs/
diff --git a/.storybook/theme.js b/.storybook/theme.js
index 0867f6a830b5..96631764726f 100644
--- a/.storybook/theme.js
+++ b/.storybook/theme.js
@@ -7,17 +7,17 @@ export default create({
     fontBase: 'ExpensifyNeue-Regular',
     fontCode: 'monospace',
     base: 'dark',
-    appBg: colors.greenHighlightBackground,
-    colorPrimary: colors.greenDefaultButton,
+    appBg: colors.darkHighlightBackground,
+    colorPrimary: colors.darkDefaultButton,
     colorSecondary: colors.green,
-    appContentBg: colors.greenAppBackground,
-    textColor: colors.white,
-    barTextColor: colors.white,
+    appContentBg: colors.darkAppBackground,
+    textColor: colors.darkPrimaryText,
+    barTextColor: colors.darkPrimaryText,
     barSelectedColor: colors.green,
-    barBg: colors.greenAppBackground,
-    appBorderColor: colors.greenBorders,
-    inputBg: colors.greenHighlightBackground,
-    inputBorder: colors.greenBorders,
+    barBg: colors.darkAppBackground,
+    appBorderColor: colors.darkBorders,
+    inputBg: colors.darkHighlightBackground,
+    inputBorder: colors.darkBorders,
     appBorderRadius: 8,
     inputBorderRadius: 8,
 });
diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index 9274dd8c1382..c871764117ed 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -63,6 +63,14 @@
                     {
                         "/": "/new/*",
                         "comment": "New Chat"
+                    },
+                    {
+                        "/": "/workspace/*",
+                        "comment": "Workspace Details"
+                    },
+                    {
+                        "/": "/teachersunite/*",
+                        "comment": "Teachers Unite!"
                     }
                 ]
             }
diff --git a/Gemfile.lock b/Gemfile.lock
index 9487e3c45c7a..079b5a5b742b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.3)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -19,20 +19,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.646.0)
-    aws-sdk-core (3.160.0)
+    aws-partitions (1.824.0)
+    aws-sdk-core (3.181.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.134.0)
+      aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -79,7 +79,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -88,8 +88,8 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.93.0)
-    faraday (1.10.2)
+    excon (0.103.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -117,8 +117,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.210.1)
+    fastimage (2.2.7)
+    fastlane (2.215.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -139,10 +139,11 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -150,7 +151,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -165,9 +166,9 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.29.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-core (0.9.0)
+    google-apis-androidpublisher_v3 (0.49.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -176,10 +177,10 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.15.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.11.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -187,8 +188,8 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-storage (1.43.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -196,10 +197,9 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.8.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -209,26 +209,25 @@ GEM
     httpclient (2.8.3)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     json (2.6.3)
-    jwt (2.5.0)
-    memoist (0.16.2)
+    jwt (2.7.1)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
     minitest (5.18.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
+    plist (3.7.0)
     public_suffix (4.0.7)
     rake (13.0.6)
     representable (3.2.0)
@@ -236,23 +235,23 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -266,8 +265,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
     word_wrap (1.0.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/README.md b/README.md
index f0a94a16855c..fce7cee8dcdd 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ In order to have more consistent builds, we use a strict `node` and `npm` versio
 * Changes applied to Javascript will be applied automatically via WebPack as configured in `webpack.dev.js`
 
 ## Running the iOS app 📱
-For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11580) for installing cocoapods.
+For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-to-run-cocoapods-on-apple-silicon-m1) for installing cocoapods.
 
 * Install project gems, including cocoapods, using bundler to ensure everyone uses the same versions. In the project root, run: `bundle install`
     * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
@@ -419,4 +419,4 @@ In order to compile a production desktop build, run `npm run desktop-build`, thi
 In order to compile a production iOS build, run `npm run ios-build`, this will generate a `Chat.ipa` in the root directory of this project.
 
 #### Local production build the Android app
-To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder.
\ No newline at end of file
+To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4fe65dbc4e84..1cc6170e69f5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,7 +22,7 @@ react {
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    debuggableVariants = ["developmentDebug"]
+    debuggableVariants = ["developmentDebug", "productionDebug"]
 
     /* Bundling */
     //   A list containing the node command and its flags. Default is just 'node'.
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036001
-        versionName "1.3.60-1"
+        versionCode 1001037107
+        versionName "1.3.71-7"
     }
 
     flavorDimensions "default"
diff --git a/android/app/src/development/assets/airshipconfig.properties b/android/app/src/development/assets/airshipconfig.properties
index 490f74552f11..43907fcbf251 100644
--- a/android/app/src/development/assets/airshipconfig.properties
+++ b/android/app/src/development/assets/airshipconfig.properties
@@ -5,4 +5,4 @@ developmentLogLevel = VERBOSE
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #2EAAE2
\ No newline at end of file
+notificationAccentColor = #03D47C
\ No newline at end of file
diff --git a/android/app/src/main/assets/airshipconfig.properties b/android/app/src/main/assets/airshipconfig.properties
index 194c4577de8b..e15533fdda4d 100644
--- a/android/app/src/main/assets/airshipconfig.properties
+++ b/android/app/src/main/assets/airshipconfig.properties
@@ -4,4 +4,4 @@ inProduction = true
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #2EAAE2
\ No newline at end of file
+notificationAccentColor = #03D47C
\ No newline at end of file
diff --git a/android/app/src/main/res/values-large/orientation.xml b/android/app/src/main/res/values-large/orientation.xml
index c06e0147ee73..9f60d109a2fc 100644
--- a/android/app/src/main/res/values-large/orientation.xml
+++ b/android/app/src/main/res/values-large/orientation.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="portrait_only">false</bool>
+    <bool name="portrait_only">true</bool>
 </resources>
diff --git a/android/app/src/main/res/values-sw600dp/orientation.xml b/android/app/src/main/res/values-sw600dp/orientation.xml
index c06e0147ee73..9f60d109a2fc 100644
--- a/android/app/src/main/res/values-sw600dp/orientation.xml
+++ b/android/app/src/main/res/values-sw600dp/orientation.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="portrait_only">false</bool>
+    <bool name="portrait_only">true</bool>
 </resources>
diff --git a/assets/animations/Safe.json b/assets/animations/Safe.json
new file mode 100644
index 000000000000..15d4f4917dd0
--- /dev/null
+++ b/assets/animations/Safe.json
@@ -0,0 +1 @@
+{"v":"5.9.0","fr":24,"ip":0,"op":64,"w":625,"h":400,"nm":"C","assets":[{"id":"comp_0","nm":"E","fr":24,"layers":[{"ind":1,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.1},"t":38,"s":[1002.5,667.5,0],"to":[25.25,-33.75,0],"ti":[-25.25,33.75,0]},{"t":48,"s":[1154,465,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":2,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0},"t":38,"s":[941.5,674.5,0],"to":[-30.25,-30,0],"ti":[30.25,30,0]},{"t":48,"s":[760,494.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":3,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.041},"t":38,"s":[984,730.5,0],"to":[7.333,29.25,0],"ti":[-7.333,-29.25,0]},{"t":48,"s":[1028,906,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":4,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.166},"t":39,"s":[995.5,714.5,0],"to":[42,3.333,0],"ti":[-42,-3.333,0]},{"t":49,"s":[1247.5,734.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":5,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.036},"t":39,"s":[957.5,666.5,0],"to":[9.167,-41.5,0],"ti":[-9.167,41.5,0]},{"t":49,"s":[1012.5,417.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":6,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0},"t":39,"s":[932,732.5,0],"to":[-20.75,21.5,0],"ti":[20.75,-21.5,0]},{"t":49,"s":[807.5,861.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":7,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":41,"s":[-44]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"t":51,"s":[48]}]},"p":{"a":0,"k":[1033,663,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":41,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":46,"s":[100,100,100]},{"t":51,"s":[25,25,100]}],"l":2}},"ao":0,"ip":41,"op":52,"st":0},{"ind":8,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":45,"s":[-45]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":49,"s":[0]},{"t":54,"s":[48]}]},"p":{"a":0,"k":[906,769,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":45,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":49,"s":[100,100,100]},{"t":54,"s":[25,25,100]}],"l":2}},"ao":0,"ip":44,"op":55,"st":2},{"ind":9,"ty":3,"nm":"b","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":0,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":5,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":33,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":37,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":38,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":42,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.65,"y":0.65},"o":{"x":0.313,"y":0.313},"t":57,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.378,"y":0.378},"t":59,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"t":63,"s":[886,870,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[106,92,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[0.407,0.407,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0.273,0.273,0]},"t":37,"s":[98.704,102.592,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[98,104,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":42,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":52,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,-0.264,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[97,103,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,0.881,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0.16,0]},"t":59,"s":[97.166,102.834,100]},{"t":63,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":10,"ty":3,"nm":"h","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[93,-80,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[97,-80,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[97,-80,0],"to":[13.333,0,0],"ti":[-13.333,0,0]},{"t":37,"s":[177,-80,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":11,"ty":3,"nm":"h","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0]},{"i":{"x":[0.694],"y":[0.113]},"o":{"x":[0.299],"y":[0]},"t":14,"s":[13]},{"i":{"x":[0.79],"y":[0.911]},"o":{"x":[0.43],"y":[0.241]},"t":19,"s":[-6.26]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[-46]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[-81]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":23,"s":[-125]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":24,"s":[-241]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":25,"s":[-285]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":26,"s":[-319]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":32,"s":[-376]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":33,"s":[-376]},{"t":37,"s":[-372]}]},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[90,-80,0],"to":[0.833,0,0],"ti":[-0.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[95,-80,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[95,-80,0],"to":[13.333,0,0],"ti":[-13.333,0,0]},{"t":37,"s":[175,-80,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[55,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":12,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[182,-134,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[186,-134,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[186,-134,0],"to":[6.5,0,0],"ti":[-6.5,0,0]},{"t":37,"s":[225,-134,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[80,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":13,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[170,-139,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[174,-139,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[174,-139,0],"to":[5.833,0,0],"ti":[-5.833,0,0]},{"t":37,"s":[209,-139,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[53,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":14,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[49,52,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":15,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":0,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":33,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"t":37,"s":[223,-145,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[114,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[42,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":16,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[75.5,-107.5,0],"to":[0.583,0.583,0],"ti":[-0.583,-0.583,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[79,-104,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[79,-104,0],"to":[14.333,0,0],"ti":[-14.333,0,0]},{"t":37,"s":[165,-104,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":17,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":38,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":43,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":51,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.65,"y":0.65},"o":{"x":0.313,"y":0.313},"t":57,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.378,"y":0.378},"t":59,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"t":63,"s":[222,-147,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[111,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":51,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,1,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[111,100,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,1,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0,0]},"t":59,"s":[108.452,100,100]},{"t":63,"s":[65,100,100]}],"l":2}},"ao":0,"ip":38,"op":64,"st":0},{"ind":18,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[306,-107,0],"to":[-1.333,0,0],"ti":[1.333,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":43,"s":[298,-107,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":51,"s":[298,-107,0],"to":[1.333,0,0],"ti":[4.333,0,0]},{"i":{"x":0.723,"y":1},"o":{"x":0.313,"y":0},"t":57,"s":[306,-107,0],"to":[-0.439,0,0],"ti":[0.802,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.378,"y":0},"t":59,"s":[304.119,-107,0],"to":[-7.123,0,0],"ti":[5.093,0,0]},{"t":63,"s":[272,-107,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[109,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":51,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,1,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[109,100,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,1,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0,0]},"t":59,"s":[106.563,100,100]},{"t":63,"s":[65,100,100]}],"l":2}},"ao":0,"ip":38,"op":64,"st":0},{"ind":19,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[49,52,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":20,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[914,792,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[914,782,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[914,795,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[914,792,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[914,792,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[914,788,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[914,792,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":21,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[969,759,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[969,749,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[969,762,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[969,759,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[969,759,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[969,755,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[969,759,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":22,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[1017,763,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[1017,753,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[1017,766,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[1017,763,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[1017,763,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1017,759,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1017,763,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":23,"ty":3,"nm":"g","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":36,"s":[1015,712,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":40,"s":[1015,702,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":45,"s":[1015,715,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":50,"s":[1015,712,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":54,"s":[1015,712,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1015,708,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1015,712,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":24,"ty":3,"nm":"g","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":36,"s":[931,726,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":40,"s":[931,716,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":45,"s":[931,729,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":50,"s":[931,726,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":54,"s":[931,726,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[931,722,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[931,726,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":25,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[955,679,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[955,669,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":47,"s":[955,682,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[955,679,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[955,679,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[955,675,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[955,679,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":26,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[1025,686,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[1025,676,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":47,"s":[1025,689,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[1025,686,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[1025,686,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1025,682,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1025,686,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":27,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[142,-112,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":28,"ty":4,"nm":"s","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-122,94,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.301,-0.189],[0,0],[2.372,-2.313],[0,0],[-0.223,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.559,3.265],[0,0],[0.941,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.313],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.584,-16.859],[6.572,-10.804],[9.581,-8.618],[16.263,-7.647],[18.478,-0.83],[13.643,3.882],[12.494,7.42],[13.635,14.074],[7.836,18.287],[1.859,15.145],[-1.86,15.145],[-7.836,18.287],[-13.635,14.074],[-12.493,7.42],[-13.642,3.882],[-18.477,-0.83],[-16.262,-7.647],[-9.581,-8.618],[-6.572,-10.804],[-3.584,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1131.528,497.634]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.408,-1.268],[0,0],[0.705,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.408],[1.128,0.282]],"o":[[0,0],[-0.986,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.128,-1.127],[0,0],[-1.127,-1.409],[-1.126,-0.281]],"v":[[8.425,-8.645],[6.128,-11.128],[3.31,-17.187],[-0.212,-18.878],[-3.734,-16.623],[-7.256,-9.721],[-10.637,-8.312],[-16.835,-7.326],[-19.512,-4.789],[-18.667,-0.422],[-13.454,4.367],[-12.75,8.031],[-13.595,14.37],[-12.186,18.315],[-6.974,18.032],[-1.339,14.933],[2.042,15.638],[7.959,18.596],[12.185,17.891],[13.453,14.229],[12.326,7.185],[13.312,4.086],[19.229,-1.549],[18.948,-5.352],[15.566,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1131.759,497.456]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":29,"ty":4,"nm":"s","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[219,68,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.302,-0.189],[0,0],[2.372,-2.312],[0,0],[-0.222,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.559,3.265],[0,0],[0.942,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.312],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.584,-16.859],[6.572,-10.804],[9.581,-8.618],[16.263,-7.647],[18.478,-0.831],[13.643,3.882],[12.493,7.42],[13.635,14.074],[7.836,18.287],[1.859,15.145],[-1.86,15.145],[-7.836,18.287],[-13.635,14.074],[-12.493,7.42],[-13.643,3.882],[-18.477,-0.831],[-16.262,-7.647],[-9.581,-8.618],[-6.572,-10.804],[-3.584,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[790.365,522.523]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.409,-1.268],[0,0],[0.704,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.409],[1.127,0.282]],"o":[[0,0],[-0.987,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.127,-1.127],[0,0],[-1.127,-1.408],[-1.127,-0.281]],"v":[[8.426,-8.645],[6.129,-11.128],[3.311,-17.187],[-0.211,-18.878],[-3.733,-16.623],[-7.255,-9.721],[-10.636,-8.312],[-16.834,-7.326],[-19.511,-4.789],[-18.666,-0.422],[-13.453,4.367],[-12.749,8.031],[-13.594,14.37],[-12.185,18.315],[-6.973,18.032],[-1.338,14.933],[2.043,15.638],[7.96,18.596],[12.186,17.891],[13.454,14.229],[12.327,7.185],[13.313,4.086],[19.23,-1.549],[18.948,-5.354],[15.567,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[790.595,522.345]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":30,"ty":4,"nm":"s","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-13,-288,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.301,-0.189],[0,0],[2.372,-2.312],[0,0],[-0.222,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.56,3.265],[0,0],[0.942,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.312],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.583,-16.859],[6.571,-10.804],[9.58,-8.618],[16.262,-7.647],[18.477,-0.831],[13.642,3.882],[12.492,7.42],[13.634,14.074],[7.835,18.287],[1.859,15.145],[-1.861,15.145],[-7.837,18.287],[-13.635,14.074],[-12.494,7.42],[-13.644,3.882],[-18.478,-0.831],[-16.263,-7.647],[-9.582,-8.618],[-6.573,-10.804],[-3.585,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1021.652,878.862]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.408,-1.268],[0,0],[0.705,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.409],[1.128,0.282]],"o":[[0,0],[-0.986,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.128,-1.127],[0,0],[-1.127,-1.408],[-1.126,-0.281]],"v":[[8.425,-8.645],[6.128,-11.128],[3.31,-17.187],[-0.212,-18.878],[-3.734,-16.623],[-7.256,-9.721],[-10.637,-8.312],[-16.835,-7.326],[-19.512,-4.789],[-18.667,-0.423],[-13.454,4.367],[-12.75,8.03],[-13.595,14.37],[-12.186,18.315],[-6.974,18.032],[-1.339,14.933],[2.042,15.638],[7.959,18.596],[12.185,17.891],[13.453,14.228],[12.326,7.185],[13.312,4.086],[19.229,-1.549],[18.948,-5.354],[15.566,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1021.883,878.685]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":31,"ty":4,"nm":"s","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-198,-141,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.068,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.311],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.106],[7.984,-11.707],[14.703,-12.371],[18.491,-6.286],[14.931,-0.55],[14.666,3.16],[17.373,9.345],[12.757,14.829],[6.201,13.216],[2.59,14.109],[-2.455,18.596],[-9.096,15.9],[-9.588,9.166],[-11.554,6.009],[-17.38,2.596],[-16.868,-4.553],[-10.616,-7.101],[-8.221,-9.947],[-6.775,-16.542]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1206.516,732.392]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.412],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.672,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.411],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.162,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.784],[6.533,13.656],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1206.661,732.158]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":32,"ty":4,"nm":"s","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[5,134,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.067,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.311],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.106],[7.984,-11.707],[14.703,-12.371],[18.491,-6.287],[14.931,-0.551],[14.666,3.16],[17.373,9.345],[12.757,14.829],[6.201,13.215],[2.59,14.109],[-2.455,18.595],[-9.096,15.9],[-9.588,9.165],[-11.554,6.009],[-17.38,2.595],[-16.868,-4.553],[-10.616,-7.102],[-8.221,-9.947],[-6.775,-16.543]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1003.018,457.183]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.412],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.673,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.411],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.161,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.785],[6.533,13.656],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1003.163,456.949]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":33,"ty":4,"nm":"s","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[183,-251,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.067,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.312],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.107],[7.984,-11.708],[14.703,-12.372],[18.491,-6.287],[14.931,-0.551],[14.666,3.159],[17.373,9.344],[12.757,14.828],[6.201,13.215],[2.59,14.109],[-2.455,18.595],[-9.096,15.899],[-9.588,9.165],[-11.554,6.008],[-17.38,2.595],[-16.868,-4.554],[-10.616,-7.102],[-8.221,-9.948],[-6.775,-16.543]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[826.073,843.483]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.411],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.673,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.412],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.162,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.784],[6.533,13.655],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[826.218,843.248]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":34,"ty":4,"nm":"s","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-24,-71,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.887,-13.663]],"o":[[14.055,2.969],[0,0]],"v":[[-12.203,-13.299],[12.203,13.299]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.756,676.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-13.603,2.79]],"o":[[2.906,-13.951],[0,0]],"v":[[-11.693,13.585],[11.693,-13.584]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.801,676.14]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[2.887,13.662]],"o":[[-14.055,-2.969],[0,0]],"v":[[12.472,11.971],[-12.472,-11.971]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.023,650.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[13.603,-2.79]],"o":[[-2.906,13.951],[0,0]],"v":[[11.426,-12.251],[-11.425,12.251]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.978,650.875]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.518,1.139],[2.755,3.369],[0.956,4.707],[0.234,-0.024],[4.601,-4.339],[4.891,-1.655],[-4.14,-4.891],[-1.773,-6.039],[-0.293,0.019],[-2.404,4.223],[-7.336,2.215],[-0.049,0.218]],"o":[[-3.961,-1.792],[-2.999,-3.669],[-0.217,0.049],[-0.438,6.266],[-3.404,3.211],[5.775,1.396],[4.201,4.965],[0.267,-0.056],[0.658,-4.272],[3.85,-6.766],[0.022,-0.223],[-2.523,-0.434]],"v":[[15.656,-4.367],[5.309,-12.227],[-0.689,-25.093],[-1.363,-24.98],[-9.593,-8.044],[-23.102,-1.03],[-7.773,8.232],[0.268,25.093],[0.61,24.984],[5.448,12.271],[23.081,-1.535],[22.804,-1.808]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1034.497,664.127]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":42,"op":52,"st":0},{"ind":35,"ty":4,"nm":"s","parent":8,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[103,-177,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.887,-13.663]],"o":[[14.055,2.969],[0,0]],"v":[[-12.203,-13.299],[12.203,13.299]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[895.756,782.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-13.603,2.79]],"o":[[2.906,-13.951],[0,0]],"v":[[-11.693,13.585],[11.693,-13.584]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.801,782.14]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[2.887,13.662]],"o":[[-14.055,-2.969],[0,0]],"v":[[12.471,11.971],[-12.472,-11.971]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.023,756.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[13.603,-2.79]],"o":[[-2.906,13.951],[0,0]],"v":[[11.426,-12.251],[-11.425,12.251]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[894.978,756.875]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.518,1.139],[2.755,3.369],[0.957,4.707],[0.234,-0.024],[4.602,-4.339],[4.891,-1.655],[-4.14,-4.891],[-1.772,-6.039],[-0.293,0.019],[-2.403,4.223],[-7.336,2.215],[-0.049,0.218]],"o":[[-3.961,-1.792],[-2.999,-3.669],[-0.217,0.049],[-0.438,6.266],[-3.404,3.211],[5.776,1.396],[4.201,4.965],[0.268,-0.056],[0.658,-4.272],[3.85,-6.766],[0.022,-0.223],[-2.522,-0.434]],"v":[[15.656,-4.367],[5.309,-12.227],[-0.689,-25.093],[-1.363,-24.98],[-9.593,-8.044],[-23.102,-1.03],[-7.773,8.232],[0.268,25.093],[0.61,24.984],[5.448,12.271],[23.081,-1.535],[22.804,-1.808]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[907.497,770.127]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":45,"op":55,"st":2},{"ind":36,"ty":4,"nm":"h","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[75,-146,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.398],[4.398,0],[0,4.398],[-4.398,0]],"o":[[0,4.398],[-4.398,0],[0,-4.398],[4.398,0]],"v":[[7.963,0],[0,7.963],[-7.963,0],[0,-7.963]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[934.796,738.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-9.856],[9.458,0],[0,9.856],[-9.458,0]],"o":[[0,9.856],[-9.458,0],[0,-9.856],[9.458,0]],"v":[[17.125,0],[0,17.846],[-17.125,0],[0,-17.846]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[932.888,738.574]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.357],[4.095,0],[0,4.725],[-4.096,0]],"o":[[0,4.378],[-4.096,0],[0,-4.634],[4.095,0]],"v":[[7.963,0.098],[0.068,7.963],[-7.963,0],[0.068,-7.963]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[934.796,738.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.031],[4.032,0],[0,4.031],[-4.031,0]],"o":[[0,4.031],[-4.031,0],[0,-4.031],[4.032,0]],"v":[[7.299,-0.001],[-0.001,7.299],[-7.3,-0.001],[-0.001,-7.299]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[933.962,738.702]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-9.529],[9.162,0],[0,9.529],[-9.162,0]],"o":[[0,9.529],[-9.162,0],[0,-9.529],[9.162,0]],"v":[[17.125,-0.177],[-0.083,17.846],[-17.125,-0.177],[-0.083,-17.845]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[932.888,738.574]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":37,"ty":4,"nm":"h","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[77,-146,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.016,-3.878]],"o":[[5.016,-1.856],[0,0]],"v":[[-7.524,-0.588],[7.524,2.444]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[929.987,753.851]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.731,-4.4]],"o":[[1.774,10.592],[0,0]],"v":[[-4.323,-10.629],[4.323,10.629]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[945.755,733.21]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-0.781,6.685]],"o":[[4.838,-2.979],[0,0]],"v":[[-4.214,7.249],[4.214,-7.248]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.522,729.829]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.348,-11.45],[5.119,-5.074],[11.048,11.146],[16.289,12.664]],"o":[[22.889,23.251],[11.348,11.449],[-5.119,5.073],[-11.047,-11.147],[0,0]],"v":[[-20.161,-31.188],[21.382,-0.539],[23.227,24.845],[-1.323,20.042],[-32.731,-18.731]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.24,775.026]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[14.744,-6.517],[2.914,6.592],[-14.353,6.345],[-17.64,10.701]],"o":[[-29.886,13.09],[-14.744,6.518],[-2.914,-6.592],[14.354,-6.346],[0,0]],"v":[[35.368,-9.107],[-8.083,18.773],[-32.455,11.443],[-19.211,-9.778],[28.213,-25.292]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[887.094,762.369]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,16.12],[-7.208,0],[0,-15.694],[-2.655,-20.461]],"o":[[0.111,-32.627],[0,-16.12],[7.207,0],[0,15.693],[0,0]],"v":[[-7.374,35.17],[-15.306,-15.843],[1.253,-35.171],[15.307,-14.477],[10.322,35.17]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[931.11,687.411]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-9.468,-12.012],[-4.525,-2.95],[-6.391,8.121],[3.693,4.101],[2.867,2.283],[2.387,1.824],[0,0],[0,0]],"o":[[7.57,-2.202],[3.264,7.733],[4.524,2.951],[6.39,-8.121],[-3.692,-4.101],[-2.867,-2.284],[-2.387,-1.824],[0,0],[0,0]],"v":[[-38.034,-19.5],[-10.472,0.539],[11.962,27.967],[31.644,26.592],[32.603,6.389],[24.931,-0.95],[3.06,-13.607],[-13.692,-28.254],[-30.464,-34.713]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[962.937,771.79]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[8.353,-0.835],[4.437,-3.08],[-5.116,-8.979],[-5.189,1.876],[-3.195,1.796],[-2.589,1.525],[-5.172,1.795],[0,0]],"o":[[0,0],[-8.352,0.836],[-4.437,3.08],[5.116,8.978],[5.19,-1.876],[3.194,-1.795],[9.339,-5.607],[0,0],[0,0]],"v":[[24.733,-24.106],[3.732,-14.844],[-28.971,-5.03],[-35.877,15.128],[-16.755,22.106],[-7.066,18.513],[11.511,3.018],[33.422,-8.217],[40.993,-23.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[891.481,760.579]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.253,29.44],[0.995,5.309],[10.285,-0.995],[0.411,-5.503],[-0.332,-3.65],[-0.331,-2.986],[0,0],[0,0]],"o":[[0,0],[2.655,-7.963],[-0.996,-5.309],[-10.286,0.996],[-0.411,5.503],[0.332,3.649],[5.569,35.238],[0,0],[0,0]],"v":[[16.969,45.869],[9.486,3.568],[13.8,-31.602],[-0.799,-44.874],[-16.062,-31.602],[-16.062,-20.984],[-10.09,3.568],[-16.969,39.411],[0.196,39.411]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[932.277,697.667]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":38,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.479,1.659],[4.479,-1.659]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.159,651.134]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.325,7.335],[2.325,-7.335]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.057,637.495]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.038,-4.049],[1.038,4.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.689,717.29]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.774,-7.576],[0.774,7.576]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.072,725.07]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.645,-5.143],[-4.645,5.143]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.879,713.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.853,-0.829],[-7.853,0.83]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.474,678.805]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.475,5.812],[-6.475,-5.811]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.694,644.438]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.953,1.294],[-7.953,-1.294]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.912,660.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.878,7.12],[2.878,-7.12]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1001.042,724.724]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.081,8.57],[-3.081,-8.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.038,632.61]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.791,3.087],[7.791,-3.087]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.079,694.917]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":7,"st":0},{"ind":39,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.791,3.1]],"o":[[-0.79,-3.1],[0,0]],"v":[[1.186,4.651],[-1.186,-4.65]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.154,717.769]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.572,5.215]],"o":[[-0.571,-5.215],[0,0]],"v":[[0.857,7.823],[-0.857,-7.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1018.215,725.065]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.042,7.306],[3.041,-7.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1000.26,724.191]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.155,3.343]],"o":[[3.156,-3.343],[0,0]],"v":[[-4.733,5.014],[4.734,-5.014]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.646,712.59]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.766,3.026],[7.766,-3.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.054,693.638]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.08,0.535]],"o":[[5.08,-0.535],[0,0]],"v":[[-7.62,0.803],[7.62,-0.803]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.571,677.81]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.219,-1.199]],"o":[[-3.218,1.199],[0,0]],"v":[[4.828,-1.798],[-4.828,1.798]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.177,652.047]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.7,-4.695]],"o":[[-1.7,4.696],[0,0]],"v":[[2.55,-7.044],[-2.55,7.044]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1024.035,637.84]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.697,-5.769]],"o":[[1.697,5.769],[0,0]],"v":[[-2.545,-8.653],[2.545,8.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1007.087,632.282]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.362,-3.998]],"o":[[4.363,3.998],[0,0]],"v":[[-6.544,-5.996],[6.544,5.997]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.919,643.492]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.417,-0.993]],"o":[[5.417,0.993],[0,0]],"v":[[-8.126,-1.489],[8.126,1.489]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.839,659.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":7,"op":8,"st":0},{"ind":40,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.215,-4.814],[1.215,4.813]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1031.072,718.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.796,-8.146],[0.796,8.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1016.246,725.64]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.128,-7.241],[-3.128,7.241]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[999.136,723.526]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5.374,-5.319],[-5.374,5.319]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.936,711.05]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.636,2.969],[7.636,-2.969]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[982.562,691.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.58,-0.387],[-7.58,0.386]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.748,676.188]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.005,1.923],[-8.006,-1.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[984.574,657.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.977,1.818],[4.977,-1.819]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.666,653.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.779,6.854],[2.779,-6.854]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1025.836,639.26]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.989,-8.776],[1.989,8.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1008.789,632.405]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.255,6.514],[-6.255,-6.514]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[993.31,641.664]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":8,"op":9,"st":0},{"ind":41,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.353,-2.221],[1.353,2.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.389,711.679]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.323,-6.161],[1.323,6.161]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1026.705,721.334]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.64,-8.829],[-0.64,8.829]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1010.138,726.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.618,7.148],[3.618,-7.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[995.312,720.39]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.48,4.253],[6.48,-4.253]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[985.385,704.503]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.673,-2.302],[-7.673,2.302]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.206,686.676]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.475,0.488],[-7.475,-0.488]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.404,669.44]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.588,3.638],[-7.588,-3.638]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.055,651.843]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.403,0.885],[5.403,-0.885]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1038.742,659.097]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.332,4.776],[3.333,-4.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1030.535,643.402]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1015.45,641.18],[1015.45,625.096]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.716,7.889],[-4.717,-7.889]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.24,636.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":9,"op":10,"st":0},{"ind":42,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.952,-4.203],[0.952,4.203]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.291,715.881]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.979,-6.984],[0.979,6.984]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.475,724.274]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2.498,-7.569],[-2.498,7.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.54,725.759]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.697,5.621],[4.697,-5.62]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.615,715.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.867,3.537],[7.867,-3.537]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.827,697.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.56,-1.222],[-7.56,1.221]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.767,681.101]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.791,1.089],[-7.791,-1.089]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.078,663.283]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.894,5.473],[-6.894,-5.473]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.972,646.37]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.726,8.524],[-3.726,-8.525]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.926,633.621]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.708,2.368],[4.708,-2.368]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1035.243,648.766]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.992,7.469],[1.992,-7.469]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.065,635.629]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":10,"op":11,"st":0},{"ind":43,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.216,-1.215]],"o":[[-3.216,1.215],[0,0]],"v":[[4.824,-1.823],[-4.825,1.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.38,650.589]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.476,-5.124]],"o":[[-1.476,5.124],[0,0]],"v":[[2.214,-7.686],[-2.214,7.686]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.414,636.844]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.129,-5.705]],"o":[[2.128,5.704],[0,0]],"v":[[-3.192,-8.557],[3.193,8.557]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1005.399,632.774]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.634,-5.964],[6.634,5.964]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.867,645.17]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.203,-1.328],[8.203,1.328]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.491,661.954]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.609,1.148],[7.608,-1.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.719,679.953]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.702,3.25],[7.703,-3.25]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.167,695.88]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.895,5.492],[4.895,-5.492]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.59,714.249]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.63,2.816]],"o":[[-0.63,-2.816],[0,0]],"v":[[0.944,4.224],[-0.945,-4.224]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1033.347,717.115]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.83,7.427],[-0.83,-7.427]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.902,724.717]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.812,7.521],[2.812,-7.521]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1002.207,725.125]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":11,"op":14,"st":0},{"ind":44,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.952,-4.203],[0.952,4.203]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.291,715.881]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.979,-6.984],[0.979,6.984]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.475,724.274]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2.498,-7.569],[-2.498,7.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.54,725.759]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.697,5.621],[4.697,-5.62]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.615,715.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.867,3.537],[7.867,-3.537]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.827,697.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.56,-1.222],[-7.56,1.221]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.767,681.101]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.791,1.089],[-7.791,-1.089]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.078,663.283]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.894,5.473],[-6.894,-5.473]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.972,646.37]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.726,8.524],[-3.726,-8.525]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.926,633.621]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.708,2.368],[4.708,-2.368]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1035.243,648.766]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.992,7.469],[1.992,-7.469]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.065,635.629]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":14,"op":15,"st":1},{"ind":45,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.353,-2.221],[1.353,2.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.389,711.679]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.323,-6.161],[1.323,6.161]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1026.705,721.334]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.64,-8.829],[-0.64,8.829]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1010.138,726.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.618,7.148],[3.618,-7.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[995.312,720.39]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.48,4.253],[6.48,-4.253]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[985.385,704.503]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.673,-2.302],[-7.673,2.302]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.206,686.676]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.475,0.488],[-7.475,-0.488]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.404,669.44]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.588,3.638],[-7.588,-3.638]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.055,651.843]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.403,0.885],[5.403,-0.885]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1038.742,659.097]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.332,4.776],[3.333,-4.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1030.535,643.402]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1015.45,641.18],[1015.45,625.096]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.716,7.889],[-4.717,-7.889]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.24,636.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":15,"op":16,"st":1},{"ind":46,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.215,-4.814],[1.215,4.813]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1031.072,718.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.796,-8.146],[0.796,8.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1016.246,725.64]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.128,-7.241],[-3.128,7.241]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[999.136,723.526]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5.374,-5.319],[-5.374,5.319]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.936,711.05]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.636,2.969],[7.636,-2.969]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[982.562,691.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.58,-0.387],[-7.58,0.386]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.748,676.188]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.005,1.923],[-8.006,-1.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[984.574,657.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.977,1.818],[4.977,-1.819]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.666,653.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.779,6.854],[2.779,-6.854]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1025.836,639.26]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.989,-8.776],[1.989,8.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1008.789,632.405]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.255,6.514],[-6.255,-6.514]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[993.31,641.664]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":16,"op":17,"st":1},{"ind":47,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.791,3.1]],"o":[[-0.79,-3.1],[0,0]],"v":[[1.186,4.651],[-1.186,-4.65]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.154,717.769]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.572,5.215]],"o":[[-0.571,-5.215],[0,0]],"v":[[0.857,7.823],[-0.857,-7.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1018.215,725.065]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.042,7.306],[3.041,-7.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1000.26,724.191]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.155,3.343]],"o":[[3.156,-3.343],[0,0]],"v":[[-4.733,5.014],[4.734,-5.014]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.646,712.59]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.766,3.026],[7.766,-3.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.054,693.638]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.08,0.535]],"o":[[5.08,-0.535],[0,0]],"v":[[-7.62,0.803],[7.62,-0.803]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.571,677.81]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.219,-1.199]],"o":[[-3.218,1.199],[0,0]],"v":[[4.828,-1.798],[-4.828,1.798]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.177,652.047]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.7,-4.695]],"o":[[-1.7,4.696],[0,0]],"v":[[2.55,-7.044],[-2.55,7.044]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1024.035,637.84]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.697,-5.769]],"o":[[1.697,5.769],[0,0]],"v":[[-2.545,-8.653],[2.545,8.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1007.087,632.282]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.362,-3.998]],"o":[[4.363,3.998],[0,0]],"v":[[-6.544,-5.996],[6.544,5.997]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.919,643.492]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.417,-0.993]],"o":[[5.417,0.993],[0,0]],"v":[[-8.126,-1.489],[8.126,1.489]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.839,659.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":17,"op":18,"st":1},{"ind":48,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.479,1.659],[4.479,-1.659]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.159,651.134]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.325,7.335],[2.325,-7.335]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.057,637.495]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.038,-4.049],[1.038,4.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.689,717.29]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.774,-7.576],[0.774,7.576]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.072,725.07]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.645,-5.143],[-4.645,5.143]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.879,713.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.853,-0.829],[-7.853,0.83]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.474,678.805]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.475,5.812],[-6.475,-5.811]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.694,644.438]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.953,1.294],[-7.953,-1.294]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.912,660.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.878,7.12],[2.878,-7.12]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1001.042,724.724]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.081,8.57],[-3.081,-8.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.038,632.61]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.791,3.087],[7.791,-3.087]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.079,694.917]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":18,"op":38,"st":0},{"ind":49,"ty":4,"nm":"d","parent":12,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-14,-92,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.665,0.957],[-6.664,-0.957]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1027.203,706.13]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.665,0.957],[-6.664,-0.957]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.857,659.181]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.761],[3.769,0],[0,5.761],[-3.769,0]],"o":[[0,5.761],[-3.769,0],[0,-5.761],[3.769,0]],"v":[[6.825,0],[0,10.431],[-6.824,0],[0,-10.431]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.321,683.429]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-13.072],[8.552,0],[0,13.072],[-8.551,0]],"o":[[0,13.072],[-8.551,0],[0,-13.072],[8.552,0]],"v":[[15.484,0],[0,23.668],[-15.484,0],[0,-23.668]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.521,683.806]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,13.071],[-8.552,0]],"o":[[-8.552,0],[0,-13.072],[0,0]],"v":[[7.742,23.668],[-7.742,0],[7.742,-23.668]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1015.45,681.892]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.436],[3.543,0],[0,5.436],[-3.543,0]],"o":[[0,5.436],[-3.543,0],[0,-5.436],[3.543,0]],"v":[[6.71,-0.018],[0.295,10.414],[-6.711,0.022],[0.295,-10.414]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1037.246,683.446]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.273,-14.001],[-5.747,-3.465],[0,0],[-4.162,21.333]],"o":[[0,0],[0,0],[-3.546,15.293],[0,0],[0,0],[1.355,-12.273]],"v":[[14.16,-22.341],[2.215,-24.111],[-10.614,-8.184],[-0.882,22.341],[11.506,24.111],[2.658,-5.53]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.179,682.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-12.736],[8.612,0],[0,12.736],[-8.613,0]],"o":[[0,12.736],[-8.613,0],[0,-12.736],[8.612,0]],"v":[[15.969,0.078],[0.355,23.867],[-15.969,0.078],[-0.374,-23.867]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1036.036,683.738]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":50,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.583,-13.275]],"o":[[2.542,13.252],[0,0]],"v":[[0.512,-19.896],[-3.054,19.896]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.553,685.835]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,28.82],[-18.576,0]],"o":[[-21.899,0],[0,-27.109],[0,0]],"v":[[18.914,55.778],[-18.914,0.041],[14.936,-55.777]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.864,679.407]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[16.43,0],[0,30.982],[-23.579,0],[-4.672,-24.325]],"o":[[-7.138,17.878],[-23.579,0],[0,-30.982],[19.963,0],[0,0]],"v":[[38.479,26.023],[0.648,56.097],[-42.046,0],[0.648,-56.097],[42.046,-13.768]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1005.02,679.708]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-21.291,9.809],[10.312,-35.082],[-34.418,3.115],[2.873,51.821],[0,0]],"o":[[0,0],[-9.475,35.945],[-6.259,-0.27],[0.12,-0.832],[0,0]],"v":[[17.567,-57.392],[-17.659,-20.046],[27.134,54.277],[-10.362,-2.742],[-8.838,-17.97]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[983.312,681.355]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.193,-30.602],[20.464,-2.017],[0,30.602],[-20.89,0]],"o":[[-0.188,29.712],[-20.79,2.049],[0,-30.602],[20.89,0]],"v":[[37.728,-0.737],[-0.096,54.673],[-37.921,-0.737],[-2.691,-56.721]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1010.542,680.406]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":51,"ty":4,"nm":"S","parent":14,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":-1},"p":{"a":0,"k":[123,-275,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[84.5,50],[154.5,12],[215.5,368],[-60,378.5],[-57,107]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"S"}],"ip":0,"op":64,"st":0},{"ind":52,"ty":4,"nm":"b","parent":14,"tt":2,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[123,-278,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.948,0],[0,5.222],[4.947,0]],"o":[[0,5.222],[4.947,0],[0,-5.223],[-4.948,0]],"v":[[-8.958,0],[0,9.456],[8.958,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1024.823,530.913]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.222],[4.948,0]],"o":[[0,5.222],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[994.409,543.632]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.459,556.904]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[922.63,571.061]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.958,0],[0,9.456],[-8.959,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[883.81,581.236]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[847.091,567.964]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.222],[-4.948,0]],"o":[[0,5.222],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[817.008,549.826]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[24.097,8.032],[-24.098,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.924]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[6.025,-30.925],[-6.024,-0.402],[-2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[872.802,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.82,-30.925],[24.098,8.434],[-4.016,30.925],[-24.097,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-24.097,8.032],[24.097,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-6.024,-30.925],[6.024,-0.402],[2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[951.141,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.819,-30.925],[-24.097,8.434],[4.017,30.925],[24.098,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[2.511,1.186],[0,0],[0.014,-5.253],[0,0],[-0.697,-1.119],[0,0],[-1.35,-0.593],[0,0],[0.024,5.187],[0,0]],"o":[[0,0],[-0.013,-2.719],[0,0],[-4.851,-2.292],[0,0],[-0.004,1.31],[0,0],[0.768,1.233],[0,0],[4.855,2.13],[0,0],[0,0]],"v":[[36.582,69.522],[36.067,-71.032],[31.943,-77.414],[-25.981,-104.779],[-36.488,-98.383],[-36.892,56.11],[-35.832,59.825],[-21.818,82.338],[-18.567,85.141],[26.552,104.94],[36.872,98.409],[36.734,69.522]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[831.343,714.552]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.464,0],[0,8.344],[-4.924,2.734]],"o":[[-4.668,2.091],[-15.026,0],[0,-4.172],[0,0]],"v":[[22.139,9.552],[5.069,12.895],[-22.138,-2.213],[-14.169,-12.895]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[808.179,817.41]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[812.805,836.023]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-3.305],[15.026,0],[4.978,3.561]],"o":[[3.243,2.487],[0,8.344],[-8.748,0],[0,0]],"v":[[19.204,-11.979],[24.358,-3.129],[-2.849,11.979],[-24.358,6.125]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.871,798.861]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.579,816.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.262,0],[0,7.513],[-0.704,1.437]],"o":[[1.025,0.937],[0,7.513],[-10.262,0],[0,-1.615],[0,0]],"v":[[17.133,-9.102],[18.581,-4.501],[-0.001,9.102],[-18.581,-4.501],[-17.492,-9.101]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.686,868.317]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-2.311],[14.843,0],[0,8.613],[-1.156,1.076]],"o":[[1.554,1.973],[0,8.613],[-14.843,0],[0,-1.077],[0,0]],"v":[[24.455,-11.036],[26.875,-4.558],[0,11.036],[-26.875,-4.558],[-25.166,-9.239]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.64,851.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,845.788],[883.81,778.765]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,778.765],[883.81,630.937]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-41.838,-20.679],[0,0],[-13.667,5.067],[0,0],[45.715,17.404],[6.243,0.052]],"o":[[0,0],[-43.889,15.871],[0,0],[13.068,6.458],[0,0],[45.865,-17.004],[-5.927,-2.256],[0,0]],"v":[[-48.32,-39.792],[-53.245,-38.011],[-58.703,59.297],[-57.951,59.669],[-16.064,61.849],[54.392,35.727],[54.825,-63.452],[36.421,-66.916]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.482,494.565]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[5.964,-2.156],[0,0]],"o":[[-6.243,-0.052],[0,0],[0,0]],"v":[[42.371,-13.536],[23.911,-10.381],[-42.37,13.588]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[913.533,441.185]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-22.66,-11.2],[0,0],[-7.403,2.745],[0,0],[24.759,9.426],[0,0]],"o":[[0,0],[-23.77,8.596],[0,0],[7.078,3.498],[0,0],[24.84,-9.21],[0,0],[0,0]],"v":[[-92.612,-34.094],[-110.589,-27.593],[-113.545,25.109],[-52.348,55.356],[-29.661,56.536],[111.212,4.308],[111.446,-49.407],[85.514,-59.28]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[923.265,544.66]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-10.475,-5.177],[0,0],[-3.422,1.268],[0,0],[11.446,4.357],[0,0]],"o":[[0,0],[-10.989,3.973],[0,0],[3.272,1.617],[0,0],[11.483,-4.258],[0,0],[0,0]],"v":[[-130.762,-30.138],[-147.021,-24.258],[-148.388,0.104],[-48.788,49.332],[-38.301,49.878],[147.31,-18.937],[147.418,-43.768],[128.039,-51.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[925.005,580.174]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-17.728,-9.042],[0,0],[-13.831,5.068],[0,0],[0,22.215],[0,0]],"o":[[0,0],[0,19.9],[0,0],[13.122,6.693],[0,0],[20.858,-7.643],[0,0],[0,0]],"v":[[-146.322,-121.324],[-146.322,63.906],[-117.435,111.068],[-68.026,136.271],[-25.755,138.818],[111.596,88.488],[146.322,38.778],[146.322,-143.886]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[926.833,704.772]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.866,2.654],[0,0],[0.884,-7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.866,-2.655],[0,0],[-0.885,7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[36.055,-65.032],[31.631,-76.534],[-27.65,-104.849],[-36.055,-98.654],[-36.498,57.511],[-21.456,84.497],[-11.281,89.806],[25.88,105.29],[33.843,105.733],[36.94,100.423]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[831.386,713.955]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-5.088,-31.084],[-23.226,8.079],[4.645,31.084],[23.225,-8.29]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[949.948,491.314]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.668,-6.232],[-3.135,30.669],[23.668,8.368],[5.637,-30.669]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[873.413,510.49]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-23.889],[0,0],[0,-6.194],[-9.069,-6.415],[0,0],[-9.291,3.539],[0,0],[0.442,4.424],[1.327,0.885],[0,0],[26.544,10.175],[0,0],[17.696,17.696],[18.58,-4.866],[0,0],[4.494,-21.791],[0,0],[0,0]],"o":[[0,0],[0,0],[0,6.194],[0,0],[0,0],[9.29,-3.539],[0,0],[-0.442,-4.424],[-1.327,-0.884],[0,0],[-16.147,-7.121],[0,0],[-17.696,-17.696],[-18.581,4.867],[0,0],[-4.494,21.791],[0,0],[0,0]],"v":[[-132.055,21.235],[-149.308,27.429],[-155.944,38.046],[-145.106,53.751],[-50.212,100.866],[-32.958,99.539],[151.52,30.083],[155.502,19.908],[150.193,9.29],[127.189,-0.442],[106.396,-34.507],[83.163,-43.653],[69.235,-83.613],[13.051,-98.212],[-63.484,-70.783],[-92.064,-38.664],[-94.963,-18.467],[-118.341,-10.175]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[925.616,529.033]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.205,-0.719],[6.972,-12.532],[1.409,-0.652],[12.518,-4.674],[14.678,-4.721],[7.937,-3.109],[6.008,-3.367],[-1.058,10.694],[0,1.086],[0,0],[-1.071,2.068],[-4.972,1.578],[-5.873,2.236],[-17.537,6.674],[-10.891,4.659],[-9.839,1.97],[-2.72,-0.142],[-0.908,-1.043],[-0.64,-3.923],[0,-1.229],[0,0]],"o":[[-5.824,11.718],[-0.281,1.1],[-12.146,5.623],[-14.442,5.394],[-7.146,2.298],[-6.327,2.694],[-8.814,4.938],[-0.473,-0.72],[0,0],[0,-2.878],[3.522,-6.806],[5.996,-1.902],[17.53,-6.674],[11.637,-4.427],[4.004,-1.713],[2.397,-1.257],[1.509,0.079],[3.536,0.795],[0.59,0.76],[0,0],[0.072,0.615]],"v":[[133.166,36.389],[116.586,67.576],[113.183,71.41],[75.613,85.335],[31.962,100.904],[10.648,108.511],[-8.37,114.909],[-28.313,105.78],[-28.313,100.624],[-28.313,-48.77],[-26.956,-58.636],[-13.865,-66.824],[5.085,-73.772],[56.379,-93.436],[89.317,-106.317],[114.032,-114.819],[122.735,-117.831],[127.066,-116.643],[132.388,-108.518],[133.345,-105.537],[133.345,34.385]],"c":true}},"nm":"P"},{"ind":1,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-11.281,-8.627],[0,0],[0,0],[-25.87,11.612],[0,0],[0,38.709],[0,0]],"o":[[0,0],[0,0],[0,0],[4.7,7.852],[0,0],[0,0],[68.939,-24.365],[0,0],[0,-34.507],[0,0]],"v":[[-14.599,-148.147],[-146.654,-121.603],[-146.654,68.184],[-132.055,100.037],[-117.01,111.318],[-66.449,138.087],[-18.58,136.535],[116.48,86.635],[145.991,37.001],[146.654,-143.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[927.164,704.387]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.806],[10.079,0],[0,6.506],[-10.078,0]],"o":[[0,6.505],[-10.078,0],[0,-6.505],[10.079,0]],"v":[[18.816,1.184],[0.567,12.964],[-18.815,0.051],[0.567,-12.964]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1029.455,812.364]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[7.9,2.803],[13.437,-4.051],[0,-0.124],[-14.455,0],[0,8.85]],"o":[[-13.097,5.033],[-0.004,0.124],[0,8.85],[14.455,0],[0,-5.83]],"v":[[13.25,-14.174],[-26.656,-0.81],[-26.671,-0.438],[-0.498,14.174],[26.67,-0.438]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1030.559,796.665]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.327],[10.262,0],[0,7.327],[-10.261,0]],"o":[[0,7.327],[-10.261,0],[0,-7.327],[10.262,0]],"v":[[18.581,0],[-0.001,13.266],[-18.581,0],[-0.001,-13.266]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.685,864.153]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.763,0],[0,8.85],[-14.764,0]],"o":[[0,8.85],[-14.764,0],[0,-8.85],[14.763,0]],"v":[[26.733,0],[0,16.023],[-26.732,0],[0,-16.023]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.496,846.991]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[29.862,0.995],[0.664,-17.585],[0,0],[0,0],[-16.59,0.664],[1.991,5.309]],"o":[[0,0],[1.041,5.758],[0,0],[0,0],[16.59,-0.663],[0,0]],"v":[[-1.659,-17.997],[-28.203,-5.64],[-18.912,4.977],[-20.24,11.281],[-0.332,22.562],[15.788,5.115]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[814.354,822.01]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":53,"ty":4,"nm":"d","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-51,-81,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-0.019,0.073],[-0.132,0.464],[-0.341,0.659],[0,0],[-0.001,0.051],[0,0],[0,0],[4.031,1.872],[2.844,-1.312],[0,0],[0,-9.732],[0,0],[-15.484,3.982],[0,0],[0,0],[0,0]],"o":[[0.125,-0.469],[-0.004,-0.763],[0,0],[0,-0.051],[0,0],[0,0],[-0.583,-4.194],[-2.256,-0.975],[0,0],[0,0],[0,0],[0,0],[15.484,-3.982],[0,0],[0,0],[0.016,-0.073]],"v":[[79.701,38.074],[80.127,36.688],[80.672,34.544],[80.672,31.077],[80.679,30.927],[80.353,28.306],[80.353,-108.836],[73.717,-118.128],[66.196,-118.128],[-74.043,-65.482],[-80.679,-53.095],[-80.679,105.724],[-64.311,115.458],[61.329,69.891],[66.637,62.37],[79.663,38.292]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[979.973,705.556]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":54,"ty":1,"nm":"R","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.882},"o":{"x":0.167,"y":0.118},"t":34,"s":[1007,599,0],"to":[2.833,-2.833,0],"ti":[-2.833,2.833,0]},{"t":36,"s":[1024,582,0]}],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":34,"s":[4,4,100]},{"t":36,"s":[3,4,100]}],"l":2}},"ao":0,"sw":1920,"sh":1080,"sc":"#057bd7","ip":34,"op":37,"st":0},{"ind":55,"ty":4,"nm":"d","parent":16,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[93,-122,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.938,-2.968]],"o":[[4.937,1.179],[0,0]],"v":[[-7.406,-3.111],[7.406,3.11]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[954.811,579.157]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-0.306,-4.202]],"o":[[3.191,1.669],[0,0]],"v":[[-2.577,-4.444],[2.578,4.444]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[964.794,586.712]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.419,-0.571]],"o":[[4.978,-4.775],[0,0]],"v":[[-7.851,2.803],[7.85,-2.233]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[939.553,578.28]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[22.219,-17.923],[-22.219,17.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[909.484,599.006]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-8.344,6.795]],"o":[[-0.247,-8.617],[0,0]],"v":[[-5.95,11.56],[6.196,-11.56]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[881.068,628.489]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.354,-48.906]],"o":[[5.48,44.39],[0,0]],"v":[[-2.802,-70.211],[-0.552,70.211]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.174,661.367]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.791,-8.893]],"o":[[-1.327,20.088],[0,0]],"v":[[5.925,-22.07],[-5.925,22.07]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.698,753.649]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-20.127,19.405],[20.126,-19.404]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[937.646,795.124]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.69,-1.495]],"o":[[-0.018,7.359],[0,0]],"v":[[-1.324,-6.37],[1.342,6.37]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[876.443,803.123]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.256,2.79]],"o":[[-6.586,9.505],[0,0]],"v":[[10.387,-4.753],[-10.387,0.284]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[907.133,819.281]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-7.604,-2.352]],"o":[[4.46,4.816],[0,0]],"v":[[-9.48,-5.036],[9.48,5.037]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[887.265,814.529]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[875.119,796.754],[875.119,640.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.008,0.936],[0.082,1.93],[0.147,5.634],[0.279,7.708],[0.103,3.719],[0.874,2.442],[0.01,0.51],[0.01,0.2],[2.212,8.594],[3.946,1.823],[5.648,-0.728],[4.04,-3.064],[2.682,-1.719],[0.081,-0.07],[9.164,-7.212],[3.172,-3.404],[1.409,-2.826],[0.657,-3.44],[0,-0.183],[0,0],[0,-0.368],[0,0],[0.01,-0.14],[0.028,-0.407],[-3.108,-3.699],[-4.435,-1.61],[-6.78,9.474],[-0.208,0.21],[-0.27,0.261],[-13.73,13.033],[-0.065,0.12],[-1.664,3.82],[-0.156,0.359],[-0.835,4.822],[-0.428,6.69],[-0.411,13.032],[-0.499,1.172],[-0.141,0.238],[0.03,0.173]],"o":[[-0.017,-1.932],[-0.238,-5.63],[-0.201,-7.71],[-0.135,-3.72],[-0.072,-2.556],[-0.207,-0.577],[-0.029,-0.187],[-0.48,-9.058],[-2.056,-3.194],[-5.079,-2.347],[-5.184,0.667],[-2.538,1.924],[-0.074,0.07],[-8.83,7.624],[-3.276,2.579],[-1.824,2.504],[-1.624,3.257],[0.016,0.172],[0,0],[0.061,0.326],[0,0],[0,0.147],[0.055,0.355],[-0.316,4.646],[3.29,3.916],[8.754,3.177],[0.185,-0.258],[0.193,-0.275],[13.595,-13.147],[0.055,-0.119],[2.115,-3.607],[0.076,-0.351],[1.965,-4.518],[1.143,-6.61],[0.832,-13.013],[-0.421,-1.088],[0.015,-0.109],[-0.002,-0.132],[-0.158,-0.914]],"v":[[48.806,-20.064],[48.625,-25.856],[48.294,-42.76],[47.604,-65.892],[47.025,-77.048],[46.615,-84.741],[46.299,-86.373],[46.24,-86.953],[43.305,-113.537],[34.721,-120.809],[18.245,-124.325],[4.802,-116.932],[-2.573,-110.676],[-2.795,-110.465],[-30.872,-88.243],[-41.328,-78.828],[-45.881,-71.937],[-48.539,-61.287],[-48.495,-60.769],[-48.495,18.9],[-48.396,19.939],[-48.396,94.665],[-48.417,95.091],[-48.373,96.234],[-45.707,109.066],[-32.979,116.835],[-6.425,115.579],[-5.832,114.884],[-5.154,114.077],[35.487,74.453],[35.645,74.097],[40.987,62.807],[41.333,61.741],[44.788,46.429],[46.927,26.436],[48.581,-12.657],[48.596,-16.135],[48.815,-16.656],[48.773,-17.108]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[923.492,700.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":56,"ty":3,"nm":"a","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[600,540,0],"to":[60,0,0],"ti":[-60,0,0]},{"i":{"x":0.667,"y":0.887},"o":{"x":0.333,"y":0},"t":51,"s":[960,540,0],"to":[0,0,0],"ti":[-0.284,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.313},"t":52,"s":[962.455,540,0],"to":[1.399,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[966,540,0],"to":[-3.6,0,0],"ti":[11.213,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":60,"s":[950.215,540,0],"to":[-3.129,0,0],"ti":[3.41,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":61,"s":[932.371,540,0],"to":[-1.308,0,0],"ti":[9.989,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":62,"s":[915.207,540,0],"to":[-8.694,0,0],"ti":[0.483,0,0]},{"t":63,"s":[893,540,0]}],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":57,"ty":4,"nm":"S","td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[960,540,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[432,384]},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"nm":"R"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[146,137]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"R"}],"ip":0,"op":64,"st":0},{"ind":58,"ty":4,"nm":"B","parent":56,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[43.53,573.11,0],"l":2},"a":{"a":0,"k":[965.53,543.11,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.035,-0.167],[-3.344,-4.013],[12.205,-0.335],[0,0]],"o":[[0,0],[11.546,0.175],[4.774,5.728],[-12.205,0.334],[0,0]],"v":[[-22.922,-8.611],[-2.585,-2.424],[18.147,-4.43],[1.762,8.277],[-18.301,5.602]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1186.095,134.345]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.035,-0.167],[-3.344,-4.013],[12.206,-0.335],[0,0]],"o":[[0,0],[11.546,0.175],[4.774,5.728],[-12.205,0.334],[0,0]],"v":[[-20.216,-6.99],[-4.895,-2.508],[15.837,-4.514],[-0.548,8.193],[-20.611,5.517]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.405,143.091]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.121,-0.078],[-3.344,-4.013],[12.205,-0.334],[0,0]],"o":[[3.555,1.527],[11.546,0.175],[4.773,5.728],[-12.206,0.335],[0,0]],"v":[[-19.547,-6.122],[-4.895,-2.508],[15.838,-4.514],[-0.547,8.192],[-20.611,5.517]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.405,151.753]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.828,-0.088],[-3.344,-4.013],[12.205,-0.335],[0,0]],"o":[[3.674,1.736],[11.546,0.175],[4.773,5.728],[-12.205,0.334],[0,0]],"v":[[-18.713,-6.201],[-5.342,-2.508],[15.39,-4.514],[-0.995,8.193],[-20.162,5.949]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.853,160.415]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":1228,"st":0},{"ind":59,"ty":4,"nm":"S","td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[960,540,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[432,384]},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"nm":"R"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[146,137]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"R"}],"ip":0,"op":64,"st":0},{"ind":60,"ty":4,"nm":"B","parent":56,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[43.53,573.11,0],"l":2},"a":{"a":0,"k":[965.53,543.11,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-4.179,3.345],[-0.668,2.677],[4.178,4.68],[-1.146,1.478],[-5.684,-5.353],[-0.165,-3.174],[0.336,-1.672],[0,0],[-4.415,-2.212],[-1.507,-2.671],[0,0],[15.415,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[5.452,-4.363],[0.346,-1.388],[-3.245,-3.638],[1.17,-1.506],[3.729,3.506],[0.166,3.179],[-0.332,1.673],[0,0],[4.686,2.34],[1.771,3.146],[0,0],[-20.509,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[130.488,25.468],[-230.581,25.468],[-230.581,1.559],[129.819,1.559],[143.026,1.559],[147.375,1.559],[163.089,1.559],[167.939,1.559],[176.13,1.559],[180.811,1.559],[185.828,1.559],[191.346,-6.968],[203.384,-13.486],[200.375,-23.851],[199.37,-31.042],[210.906,-29.536],[215.756,-19.005],[214.918,-12.482],[213.417,-10.141],[220.603,-7.967],[228.297,0.891],[230.582,32.437],[212.302,34.889],[186.442,25.468],[180.811,25.468],[172.117,25.468],[163.089,25.468],[147.375,25.468],[143.026,25.468]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[940.896,132.7]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-15.848,-0.223],[0,0],[1.772,3.145],[4.685,2.341],[0,0],[-0.331,1.672],[0.166,3.178],[3.728,3.505],[1.17,-1.507],[-3.245,-3.639],[0.346,-1.388],[5.453,-4.363],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[2.612,4.399],[13.259,-1.376],[0,0],[-1.506,-2.672],[-4.415,-2.212],[0,0],[0.337,-1.672],[-0.166,-3.174],[-5.685,-5.353],[-1.146,1.477],[4.178,4.68],[-0.668,2.676],[-4.178,3.344],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-105.281,25.025],[-105.281,25.357],[61.655,25.357],[88.852,35],[105.19,33.233],[103.509,0.78],[95.816,-8.079],[88.63,-10.253],[90.131,-12.593],[90.97,-19.116],[86.119,-29.647],[74.584,-31.153],[75.588,-23.962],[78.596,-13.597],[66.559,-7.079],[61.04,1.448],[56.024,1.448],[-105.281,1.95],[-105.281,6.801],[-105.281,16.83]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1065.683,132.812]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":1228,"st":0},{"ind":61,"ty":4,"nm":"d","parent":17,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-50,-79,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[6.975,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[36.476,-28.415],[36.476,15.542],[22.169,25.873],[-36.477,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1181.357,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.261,2.367],[0,0],[0,1.835],[0,0],[-7.008,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[-2.482,-0.905],[0,0],[-0.859,-1.611],[0,0],[0,-7.67],[0,0],[4.167,1.613],[0,0],[0,0]],"v":[[5.927,107.801],[-56.873,84.916],[-62.685,79.836],[-77.571,51.901],[-78.88,46.65],[-78.88,-94.83],[-64.377,-105.089],[71.954,-52.33],[78.88,-42.073],[78.88,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1138.954,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-9.733],[0,0],[15.128,3.981],[0,0],[0,0],[0,0],[0,0],[0,0],[-3.939,1.871],[-2.779,-1.312]],"o":[[0,0],[0,0],[0,0],[-15.127,-3.982],[0,0],[0,0],[0,0],[0,0],[0.569,-4.194],[2.204,-0.976],[0,0]],"v":[[72.613,-65.482],[79.095,-53.095],[79.095,105.725],[63.104,115.458],[-59.646,69.891],[-64.832,62.37],[-79.095,35.384],[-78.23,28.306],[-78.23,-108.837],[-71.748,-118.127],[-64.4,-118.127]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1138.305,705.556]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":38,"op":64,"st":0},{"ind":62,"ty":4,"nm":"d","parent":18,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-126,-119,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-6.669,4.373]],"o":[[-6.669,4.372],[0,0]],"v":[[-72.026,-117.132],[78.696,112.758]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1135.266,706.895]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[4.327,-4.699],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[10.983,-32.695],[10.983,-1.622],[7.562,15.365],[-11.889,32.695]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1225.851,786.958]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-12.298,-4.493],[-23.143,-9.041],[-22.805,-9.215],[0,-5],[0.172,-39.102]],"o":[[27.744,-16.857],[6.487,2.481],[21.744,8.04],[4,2],[0,39],[0,0]],"v":[[-86.882,-73.822],[-48.024,-85.594],[13.882,-61.423],[78.882,-37.423],[86.882,-26.423],[86.71,90.678]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1150.122,663.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-9.733],[0,0],[11.475,-10.224],[0,0],[0,0],[0,0],[0,0],[0,0],[-3.939,1.872],[-2.778,-1.312]],"o":[[0,0],[0,9.733],[-1.866,2.288],[-1.674,0.062],[0,0],[0,0],[0,0],[0,0],[9.127,-5.528],[2.204,-0.975],[0,0]],"v":[[80.353,-70.308],[86.836,-57.921],[86.836,100.899],[63.886,122.505],[57.327,116.613],[33.941,85.318],[-37.671,-21.888],[-85.506,-101.703],[-86.836,-107.385],[-65.404,-119.789],[-54.012,-121.255]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1150.076,697.148]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":38,"op":64,"st":0},{"ind":63,"ty":4,"nm":"b","parent":19,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[123,-278,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-19.518,6.981]],"o":[[19.975,-7.545],[0,0]],"v":[[-30.247,10.763],[30.246,-10.763]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[930.276,796.943]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-22,8],[-7,12],[-0.32,47.452]],"o":[[21.483,-8.019],[9,-10],[0,-47],[0,0]],"v":[[-43.401,99.735],[22.082,76.716],[43.082,41.716],[43.401,-99.736]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.924,686.444]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-0.591,1.697],[-0.105,1.416],[-0.23,0.568],[0,0],[5.556,-0.154],[0,0],[0.645,-1.456],[7.506,-10.569],[0.734,-0.251],[0.643,-0.138],[4.886,-1.77],[7.05,-2.138],[14.569,-5.251],[0,0],[-0.059,-0.154],[-1.434,-3.399],[-0.458,-0.463],[-3.041,0.294],[-0.982,0.273],[-9.367,2.812],[-11.546,4.084],[-11.368,4.678],[-4.957,1.419],[-3.277,2.289],[-3.358,6.006],[-1.936,3.082]],"o":[[0.459,-1.318],[0.047,-0.639],[0,0],[-2.987,-4.684],[0,0],[0.588,0.987],[-5.307,11.976],[-0.606,0.853],[-0.462,0.291],[-5.093,1.096],[-6.928,2.511],[-14.824,4.497],[-10.106,3.643],[0,0],[0.151,2.829],[0.4,0.467],[2.125,1.496],[0.69,-0.519],[16.286,-4.514],[11.729,-3.52],[11.582,-4.096],[4.765,-1.961],[3.784,-1.082],[3.031,-4.704],[2.017,-3.608],[0.531,-1.722]],"v":[[80.298,37.236],[80.711,33.24],[81.139,31.421],[81.139,-110.782],[67.098,-118.313],[67.098,19.669],[67.167,23.374],[47.788,57.057],[45.745,58.676],[44.095,59.334],[29.153,64.741],[9.339,71.601],[-32.732,86.728],[-65.979,97.923],[-81.08,103.647],[-78.852,114.573],[-74.963,116.971],[-69.581,117.693],[-67.032,116.68],[-32.36,105.561],[2.167,93.004],[36.746,80.469],[51.195,75.15],[61.998,70.444],[72.826,51.662],[78.608,41.529]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[979.716,704.434]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-22,8],[-7,12],[-0.32,47.452]],"o":[[21.483,-8.019],[9,-10],[0,-47],[0,0]],"v":[[-43.401,99.735],[22.082,76.716],[43.082,41.716],[43.401,-99.736]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.924,686.444]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.948,0],[0,5.222],[4.947,0]],"o":[[0,5.222],[4.947,0],[0,-5.223],[-4.948,0]],"v":[[-8.958,0],[0,9.456],[8.958,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1024.823,530.913]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.222],[4.948,0]],"o":[[0,5.222],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[994.409,543.632]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.459,556.904]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[922.63,571.061]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.958,0],[0,9.456],[-8.959,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[883.81,581.236]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[847.091,567.964]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.222],[-4.948,0]],"o":[[0,5.222],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[817.008,549.826]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[24.097,8.032],[-24.098,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.924]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[6.025,-30.925],[-6.024,-0.402],[-2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[872.802,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.82,-30.925],[24.098,8.434],[-4.016,30.925],[-24.097,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-24.097,8.032],[24.097,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-6.024,-30.925],[6.024,-0.402],[2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[951.141,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.819,-30.925],[-24.097,8.434],[4.017,30.925],[24.098,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[2.511,1.186],[0,0],[0.014,-5.253],[0,0],[-0.697,-1.119],[0,0],[-1.35,-0.593],[0,0],[0.024,5.187],[0,0]],"o":[[0,0],[-0.013,-2.719],[0,0],[-4.851,-2.292],[0,0],[-0.004,1.31],[0,0],[0.768,1.233],[0,0],[4.855,2.13],[0,0],[0,0]],"v":[[36.582,69.522],[36.067,-71.032],[31.943,-77.414],[-25.981,-104.779],[-36.488,-98.383],[-36.892,56.11],[-35.832,59.825],[-21.818,82.338],[-18.567,85.141],[26.552,104.94],[36.872,98.409],[36.734,69.522]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[831.343,714.552]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.464,0],[0,8.344],[-4.924,2.734]],"o":[[-4.668,2.091],[-15.026,0],[0,-4.172],[0,0]],"v":[[22.139,9.552],[5.069,12.895],[-22.138,-2.213],[-14.169,-12.895]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[808.179,817.41]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[812.805,836.023]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-3.305],[15.026,0],[4.978,3.561]],"o":[[3.243,2.487],[0,8.344],[-8.748,0],[0,0]],"v":[[19.204,-11.979],[24.358,-3.129],[-2.849,11.979],[-24.358,6.125]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.871,798.861]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.579,816.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.262,0],[0,7.513],[-0.704,1.437]],"o":[[1.025,0.937],[0,7.513],[-10.262,0],[0,-1.615],[0,0]],"v":[[17.133,-9.102],[18.581,-4.501],[-0.001,9.102],[-18.581,-4.501],[-17.492,-9.101]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.686,868.317]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-2.311],[14.843,0],[0,8.613],[-1.156,1.076]],"o":[[1.554,1.973],[0,8.613],[-14.843,0],[0,-1.077],[0,0]],"v":[[24.455,-11.036],[26.875,-4.558],[0,11.036],[-26.875,-4.558],[-25.166,-9.239]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.64,851.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,845.788],[883.81,778.765]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,778.765],[883.81,630.937]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-41.838,-20.679],[0,0],[-13.667,5.067],[0,0],[45.715,17.404],[6.243,0.052]],"o":[[0,0],[-43.889,15.871],[0,0],[13.068,6.458],[0,0],[45.865,-17.004],[-5.927,-2.256],[0,0]],"v":[[-48.32,-39.792],[-53.245,-38.011],[-58.703,59.297],[-57.951,59.669],[-16.064,61.849],[54.392,35.727],[54.825,-63.452],[36.421,-66.916]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.482,494.565]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[5.964,-2.156],[0,0]],"o":[[-6.243,-0.052],[0,0],[0,0]],"v":[[42.371,-13.536],[23.911,-10.381],[-42.37,13.588]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[913.533,441.185]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-22.66,-11.2],[0,0],[-7.403,2.745],[0,0],[24.759,9.426],[0,0]],"o":[[0,0],[-23.77,8.596],[0,0],[7.078,3.498],[0,0],[24.84,-9.21],[0,0],[0,0]],"v":[[-92.612,-34.094],[-110.589,-27.593],[-113.545,25.109],[-52.348,55.356],[-29.661,56.536],[111.212,4.308],[111.446,-49.407],[85.514,-59.28]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[923.265,544.66]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-10.475,-5.177],[0,0],[-3.422,1.268],[0,0],[11.446,4.357],[0,0]],"o":[[0,0],[-10.989,3.973],[0,0],[3.272,1.617],[0,0],[11.483,-4.258],[0,0],[0,0]],"v":[[-130.762,-30.138],[-147.021,-24.258],[-148.388,0.104],[-48.788,49.332],[-38.301,49.878],[147.31,-18.937],[147.418,-43.768],[128.039,-51.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[925.005,580.174]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-17.728,-9.042],[0,0],[-13.831,5.068],[0,0],[0,22.215],[0,0]],"o":[[0,0],[0,19.9],[0,0],[13.122,6.693],[0,0],[20.858,-7.643],[0,0],[0,0]],"v":[[-146.322,-121.324],[-146.322,63.906],[-117.435,111.068],[-68.026,136.271],[-25.755,138.818],[111.596,88.488],[146.322,38.778],[146.322,-143.886]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[926.833,704.772]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.866,2.654],[0,0],[0.884,-7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.866,-2.655],[0,0],[-0.885,7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[36.055,-65.032],[31.631,-76.534],[-27.65,-104.849],[-36.055,-98.654],[-36.498,57.511],[-21.456,84.497],[-11.281,89.806],[25.88,105.29],[33.843,105.733],[36.94,100.423]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[831.386,713.955]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-5.428,-31.084],[-23.566,8.079],[4.305,31.084],[23.566,-7.609]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.288,491.314]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.668,-6.194],[-4.203,29.641],[23.668,8.406],[4.645,-29.641]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[873.413,510.452]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-3.597,-22.99],[0,0],[0,-6.193],[-8.721,-4.298],[0,0],[-9.291,3.539],[0,0],[0.442,4.424],[1.327,0.885],[0,0],[26.544,10.175],[0,0],[16.466,16.466],[18.58,-4.866],[0,0],[4.494,-21.791],[0,0],[0,0]],"o":[[0,0],[0,0],[0,6.194],[0,0],[0,0],[9.29,-3.54],[0,0],[-0.442,-4.423],[-1.327,-0.885],[0,0],[-15.484,-7.963],[0,0],[-17.696,-17.696],[-18.581,4.866],[0,0],[-3.535,18.475],[0,0],[0,0]],"v":[[-131.159,21.003],[-149.094,27.428],[-156.159,38.952],[-144.892,53.023],[-49.998,100.866],[-32.744,99.539],[151.734,30.083],[155.716,19.907],[150.407,9.29],[127.403,-0.443],[106.61,-34.507],[83.164,-43.654],[69.449,-83.613],[13.266,-98.212],[-63.27,-70.784],[-91.81,-38.299],[-93.611,-18.468],[-116.036,-10.882]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[925.402,529.033]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.205,-0.719],[6.972,-12.532],[1.409,-0.652],[12.518,-4.674],[14.678,-4.72],[6.918,-2.946],[6.504,-2.265],[0.872,7.84],[0,1.586],[0,0],[0,0.419],[0,0],[-0.718,1.473],[-0.111,0.198],[-4.232,1.296],[-1.455,0.565],[-5.873,2.236],[-17.537,6.674],[-10.891,4.659],[-9.839,1.97],[-2.72,-0.142],[-0.908,-1.043],[-0.64,-3.923],[0,-1.229],[0,0]],"o":[[-5.824,11.718],[-0.281,1.1],[-12.146,5.623],[-14.442,5.394],[-7.146,2.299],[-6.327,2.695],[-7.126,2.482],[-0.916,-0.805],[0,0],[-0.079,-0.364],[0,0],[-0.492,-1.211],[0.101,-0.206],[0.573,-4.286],[1.513,-0.697],[5.864,-2.276],[17.53,-6.674],[11.637,-4.427],[4.004,-1.713],[2.397,-1.257],[1.509,0.079],[3.536,0.796],[0.59,0.76],[0,0],[0.072,0.615]],"v":[[133.166,36.389],[116.586,67.576],[113.183,71.41],[75.613,84.364],[31.962,99.644],[10.648,106.859],[-8.37,114.909],[-26.604,108.326],[-28.129,104.741],[-28.129,0.271],[-28.252,-0.902],[-28.252,-52.668],[-28.065,-56.774],[-27.738,-57.372],[-18.365,-64.953],[-13.865,-66.824],[3.102,-73.657],[56.379,-93.436],[89.317,-106.318],[114.032,-114.819],[121.941,-117.038],[125.694,-115.271],[132.388,-108.518],[133.345,-105.537],[133.345,34.385]],"c":true}},"nm":"P"},{"ind":1,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-11.281,-8.627],[0,0],[0,0],[-25.87,11.613],[0,0],[0,38.709],[0,0]],"o":[[0,0],[0,0],[0,0],[4.7,7.852],[0,0],[0,0],[68.939,-24.365],[0,0],[0,-34.507],[0,0]],"v":[[-14.599,-148.147],[-146.654,-121.604],[-146.654,68.184],[-132.055,100.036],[-117.01,111.318],[-66.449,138.087],[-18.58,136.535],[116.48,86.635],[145.991,37.001],[146.654,-143.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[927.164,704.388]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.806],[10.079,0],[0,6.506],[-10.078,0]],"o":[[0,6.505],[-10.078,0],[0,-6.505],[10.079,0]],"v":[[18.816,1.184],[0.567,12.964],[-18.815,0.051],[0.567,-12.964]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1029.455,812.364]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.455,0],[0,8.85],[-14.454,0]],"o":[[0,8.85],[-14.454,0],[0,-8.85],[14.455,0]],"v":[[26.67,0.706],[-0.498,15.318],[-26.67,0.706],[-0.498,-15.318]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1030.559,795.521]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.327],[10.262,0],[0,7.327],[-10.261,0]],"o":[[0,7.327],[-10.261,0],[0,-7.327],[10.262,0]],"v":[[18.581,0],[-0.001,13.266],[-18.581,0],[-0.001,-13.266]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.685,864.153]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.763,0],[0,8.85],[-14.764,0]],"o":[[0,8.85],[-14.764,0],[0,-8.85],[14.763,0]],"v":[[26.733,0],[0,16.023],[-26.732,0],[0,-16.023]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.496,846.991]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[29.862,0.995],[0.664,-17.585],[0,0],[0,0],[-16.59,0.664],[1.991,5.309]],"o":[[0,0],[1.041,5.758],[0,0],[0,0],[16.59,-0.663],[0,0]],"v":[[-1.659,-17.997],[-28.203,-5.64],[-18.912,4.977],[-20.24,11.281],[-0.332,22.562],[15.788,5.115]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[814.354,822.01]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":64,"ty":4,"nm":"c","parent":20,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[95,-200,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,766.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[948.066,766.516],[948.066,776.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[891.544,766.516],[891.544,776.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,779.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,766.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[919.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,778.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[939.066,778.516],[939.066,788.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[882.544,778.516],[882.544,788.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,791.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,778.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[910.805,783.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,791.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[948.066,791.516],[948.066,801.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[891.544,791.516],[891.544,801.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,804.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,791.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[919.805,796.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,804.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[940.066,804.516],[940.066,814.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.544,804.516],[883.544,814.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,817.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,804.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[911.805,809.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":65,"ty":4,"nm":"c","parent":21,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[40,-167,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,733.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.066,733.516],[1000.066,743.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[943.544,733.516],[943.544,743.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,746.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,733.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[971.805,738.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,745.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[991.066,745.516],[991.066,755.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[934.544,745.516],[934.544,755.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,758.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,745.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[962.805,750.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,758.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.066,758.516],[1000.066,768.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[943.544,758.516],[943.544,768.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,771.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,758.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[971.805,763.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.066,771.516],[992.066,781.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[935.544,771.516],[935.544,781.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,784.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[963.805,776.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":66,"ty":4,"nm":"c","parent":22,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-8,-171,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,739.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[984.231,739.271],[984.231,749.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1039.776,739.271],[1039.776,749.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,752.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,739.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1012.003,744.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,751.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[993.075,751.271],[993.075,761.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1048.62,751.271],[1048.62,761.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,764.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,751.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1020.848,756.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,764.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[984.231,764.271],[984.231,774.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1039.776,764.271],[1039.776,774.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,777.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,764.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1012.003,769.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,777.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.092,777.271],[992.092,787.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1047.638,777.271],[1047.638,787.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,790.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,777.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.865,782.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":67,"ty":4,"nm":"g","parent":23,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-6,-120,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.004,-14.219],[15.004,14.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.58,682.649]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[25.105,-6.669],[-25.105,6.669]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.471,675.098]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.997,19.024],[6.997,-19.025]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[974.369,700.792]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-30.827,-22.653],[30.828,22.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.199,742.469]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[16.279,-34.127],[-16.279,34.127]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1045.305,730.996]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.782,31.611],[5.782,-31.61]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.809,733.512]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.865,28.39],[-6.865,-28.39]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.162,736.733]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-19.055,-25.521],[19.054,25.521]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1009.972,739.602]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-16.966,-13.288],[16.965,13.288]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.332,695.055]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.14,-19.957],[-8.14,19.956]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.436,688.386]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.107,11.473],[47.106,-11.474]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1014.478,708.343]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.898,-29.025],[-16.094,34.056],[16.094,-34.057],[5.045,-31.413]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1045.49,730.926]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-19.239,-22.581],[19.239,28.32],[5.141,-28.32],[-10.846,-24.625]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1010.156,736.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.143,20.026],[2.151,13.586],[23.144,8.552],[-6.751,-20.026]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1038.44,688.316]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-24.036,19.099],[-0.343,13.216],[24.036,7.478],[-9.895,-19.099]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[991.26,700.865]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[6.655,6.275],[2.997,2.884],[4.085,-1.028],[5.638,-1.449],[4.943,-1.792],[2.279,-0.386],[1.279,-3.395],[3.747,-9.154],[-4.642,-3.606],[-8.639,-5.896],[-7.678,-5.761],[-0.402,0.474],[-0.027,0.032],[-0.025,0.098],[-2.556,3.838],[-0.975,1.827],[-0.109,0.277],[-3.204,6.475],[-3.35,7.425],[-0.974,1.941]],"o":[[-3.667,-3.458],[-3.879,1.541],[-5.645,1.42],[-5.09,1.309],[-2.298,0.833],[-1.237,3.949],[-3.488,9.255],[4.793,3.363],[8.254,6.414],[7.927,5.409],[0.203,-0.504],[0.027,-0.032],[0.02,-0.096],[1.174,-4.461],[0.792,-1.977],[0.107,-0.279],[2.647,-6.729],[3.613,-7.304],[0.893,-1.98],[-6.967,-5.903]],"v":[[27.21,-38.784],[17.172,-48.346],[5.112,-45.241],[-11.803,-40.883],[-26.907,-36.448],[-33.713,-34.506],[-37.42,-23.24],[-47.292,3.328],[-33.803,13.096],[-8.78,31.964],[14.879,48.346],[15.777,46.872],[15.855,46.775],[15.902,46.49],[22.04,34.117],[24.631,28.414],[24.953,27.578],[34.223,8.013],[44.479,-14.135],[47.292,-20.01]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1014.516,716.636]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":68,"ty":4,"nm":"g","parent":24,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[78,-134,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.892,-19.814],[5.892,19.814]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.626,718.181]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[25.078,6.767],[-25.078,-6.768]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[939.656,691.599]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.567,12.983],[15.568,-12.983]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[899.01,697.815]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.384,-35.026],[15.385,35.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[898.827,745.824]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[31.153,-21.427],[-31.153,21.428]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[945.365,759.422]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-20.804,24.492],[20.803,-24.492]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[935.015,756.357]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.239,28.022],[8.239,-28.022]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[922.45,752.828]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.753,-31.627],[3.753,31.627]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.458,749.223]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.057,-19.987],[8.056,19.987]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[922.634,704.819]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[17.022,-13.219],[-17.022,13.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[947.712,711.586]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-46.537,-13.598],[46.537,13.598]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[929.98,724.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[10.259,-24.524],[-30.958,24.524],[30.958,-18.394],[20.065,-21.624]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[945.559,756.389]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-11.992,-31.659],[-4.096,31.659],[11.992,-24.447],[-3.702,-29.235]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[918.697,749.254]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-22.914,6.658],[2.215,13.717],[22.914,19.847],[11.298,-19.847]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[953.604,718.148]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.724,6.034],[-0.261,12.776],[23.724,19.987],[7.612,-19.987]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[906.965,704.819]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.629,8.761],[1.155,3.995],[4.052,1.151],[5.608,1.562],[5.176,0.918],[2.167,0.805],[2.805,-2.302],[7.821,-6.057],[-2.218,-5.443],[-4.538,-9.424],[-3.772,-8.827],[-0.585,0.211],[-0.039,0.015],[-0.071,0.072],[-4.131,2.048],[-1.757,1.095],[-0.233,0.185],[-6.01,4.007],[-6.612,4.759],[-1.813,1.194]],"o":[[-1.449,-4.828],[-4.13,-0.604],[-5.599,-1.59],[-5.063,-1.41],[-2.408,-0.427],[-3.044,2.803],[-7.645,6.274],[2.472,5.308],[3.945,9.68],[4.163,8.646],[0.428,-0.335],[0.04,-0.014],[0.066,-0.073],[3.246,-3.278],[1.674,-1.317],[0.232,-0.189],[5.655,-4.507],[6.78,-4.522],[1.763,-1.269],[-3.085,-8.595]],"v":[[38.781,-21.288],[34.864,-34.587],[22.866,-37.924],[6.036,-42.599],[-9.262,-46.305],[-16.129,-48.024],[-24.97,-40.116],[-46.796,-22.036],[-39.992,-6.835],[-27.743,22.012],[-15.436,48.025],[-13.922,47.196],[-13.805,47.15],[-13.622,46.927],[-2.124,39.276],[2.971,35.63],[3.668,35.068],[21.473,22.752],[41.424,8.691],[46.796,5.008]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[930.037,732.889]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":69,"ty":4,"nm":"c","parent":25,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[54,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,655.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[923.042,655.305],[923.042,665.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[978.588,655.305],[978.588,665.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,668.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,655.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.815,660.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,667.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[931.887,667.305],[931.887,677.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[987.432,667.305],[987.432,677.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,680.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,667.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.66,672.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,680.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[923.042,680.305],[923.042,690.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[978.588,680.305],[978.588,690.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,693.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,680.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.815,685.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,693.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[930.904,693.305],[930.904,703.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[986.45,693.305],[986.45,703.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,706.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.773,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,693.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.721,5.39],[27.773,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[958.677,698.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":70,"ty":4,"nm":"c","parent":26,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-16,-94,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,662.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1057.066,662.516],[1057.066,672.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.544,662.516],[1000.544,672.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,675.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,662.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1028.805,667.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,674.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1048.066,674.516],[1048.066,684.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[991.544,674.516],[991.544,684.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,687.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,674.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.805,679.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,687.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1057.066,687.516],[1057.066,697.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.544,687.516],[1000.544,697.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,700.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,687.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1028.805,692.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,700.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1049.066,700.516],[1049.066,710.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.544,700.516],[992.544,710.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,713.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,700.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1020.805,705.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":71,"ty":4,"nm":"b","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[30,-114,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.599,-114.088],[77.845,-30.921],[3.198,101.826],[-101.123,46.915]],"o":[[5.331,115.762],[-117.65,39.451],[0,-126.35],[98.798,-37.851]],"v":[[95.429,-23.191],[9.426,103.692],[-85.299,30.121],[9.426,-105.292]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[973.054,702.158]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0}]}],"layers":[{"ind":1,"ty":0,"nm":"E","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[333.5,110,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[73,73,100],"l":2}},"ao":0,"w":1920,"h":1080,"ip":0,"op":64,"st":0}],"markers":[]}
\ No newline at end of file
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
index f3c02b286623..7dc851c95c9e 100644
--- a/config/webpack/webpack.common.js
+++ b/config/webpack/webpack.common.js
@@ -194,7 +194,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
         // This is also why we have to use .website.js for our own web-specific files...
         // Because desktop also relies on "web-specific" module implementations
         // This also skips packing web only dependencies to desktop and vice versa
-        extensions: ['.web.js', platform === 'web' ? '.website.js' : '.desktop.js', '.js', '.jsx', '.web.ts', platform === 'web' ? '.website.ts' : '.desktop.ts', '.ts', '.tsx'],
+        extensions: ['.web.js', platform === 'web' ? '.website.js' : '.desktop.js', '.js', '.jsx', '.web.ts', platform === 'web' ? '.website.ts' : '.desktop.ts', '.ts', '.web.tsx', '.tsx'],
         fallback: {
             'process/browser': require.resolve('process/browser'),
         },
diff --git a/config/webpack/webpack.dev.js b/config/webpack/webpack.dev.js
index af302a0e663e..19999491395e 100644
--- a/config/webpack/webpack.dev.js
+++ b/config/webpack/webpack.dev.js
@@ -24,6 +24,7 @@ module.exports = (env = {}) =>
                           '/api': 'http://[::1]:9000',
                           '/staging': 'http://[::1]:9000',
                           '/chat-attachments': 'http://[::1]:9000',
+                          '/receipts': 'http://[::1]:9000',
                       },
                   };
 
diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 42db4f642943..a99bde77236f 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 Welcome! Thanks for checking out the New Expensify app and taking the time to contribute!
 
 ## Getting Started
-If you would like to become an Expensify contributor, the first step is to read this document in its entirety. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
+If you would like to become an Expensify contributor, the first step is to read this document in its **entirety**. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
 
 #### Test Accounts
 You can create as many accounts as needed in order to test your changes directly from [the app](https://new.expensify.com/). An initial account can be created when logging in for the first time, and additional accounts can be created by opening the "New Chat" or "Group Chat" pages via the Global Create menu, inputting a valid email or phone number, and tapping the user's avatar.
@@ -47,7 +47,7 @@ Note: if you are hired for an Upwork job and have any job-specific questions, pl
 If you've found a vulnerability, please email security@expensify.com with the subject `Vulnerability Report` instead of creating an issue.
 
 ## Payment for Contributions
-We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
+We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. PLease make sure your Upwork profile is **fully verified** before applying, otherwise you run the risk of not being paid. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
 
 Payment for your contributions and bug reports will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the BugZero team member (Look for the melvin-bot "Triggered auto assignment to... (`Bug`)" to see who this is).
 
@@ -81,9 +81,9 @@ A job could be fixing a bug or working on a new feature. There are two ways you
 This is the most common scenario for contributors. The Expensify team posts new jobs to the Upwork job list [here](https://www.upwork.com/ab/jobs/search/?q=Expensify%20React%20Native&sort=recency&user_location_match=2) (you must be signed in to Upwork to view jobs). Each job in Upwork has a corresponding GitHub issue, which will include instructions to follow. You can also view all open jobs in the Expensify/App GH repository by searching for GH issues with the [`Help Wanted` label](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22). Lastly, you can follow the [@ExpensifyOSS](https://twitter.com/ExpensifyOSS) Twitter account to see a live feed of jobs that are posted.
 
 #### Raising jobs and bugs
-It’s possible that you found a new bug that we haven’t posted as a job to the [GitHub repository](https://github.com/Expensify/App/issues?q=is%3Aissue). This is an opportunity to raise it and claim the bug bounty. If it's a valid bug that we choose to resolve by deploying it to production — either internally or via an external contributor — then we will compensate you $250 for identifying the bug (we do not compensate for reporting new feature requests). If the bug is fixed by a PR that is not associated with your bug report, then you will not be eligible for the corresponding compensation unless you can find the PR that fixed it and prove your bug report came first.
-- Note: If you get assigned the job you proposed **and** you complete the job, this $250 for identifying the improvement is *in addition to* the reward you will be paid for completing the job.
-- Note about proposed bugs: Expensify has the right not to pay the $250 reward if the suggested bug has already been reported. Following, if more than one contributor proposes the same bug, the contributor who posted it first in the [#expensify-bugs](https://expensify.slack.com/archives/C049HHMV9SM) Slack channel is the one who is eligible for the bonus.
+It’s possible that you found a new bug that we haven’t posted as a job to the [GitHub repository](https://github.com/Expensify/App/issues?q=is%3Aissue). This is an opportunity to raise it and claim the bug bounty. If it's a valid bug that we choose to resolve by deploying it to production — either internally or via an external contributor — then we will compensate you $50 for identifying the bug (we do not compensate for reporting new feature requests). If the bug is fixed by a PR that is not associated with your bug report, then you will not be eligible for the corresponding compensation unless you can find the PR that fixed it and prove your bug report came first.
+- Note: If you get assigned the job you proposed **and** you complete the job, this $50 for identifying the improvement is *in addition to* the reward you will be paid for completing the job.
+- Note about proposed bugs: Expensify has the right not to pay the $50 reward if the suggested bug has already been reported. Following, if more than one contributor proposes the same bug, the contributor who posted it first in the [#expensify-bugs](https://expensify.slack.com/archives/C049HHMV9SM) Slack channel is the one who is eligible for the bonus.
 - Note: whilst you may optionally propose a solution for that job on Slack, solutions are ultimately reviewed in GitHub. The onus is on you to propose the solution on GitHub, and/or ensure the issue creator will include a link to your proposal.
 
 Please follow these steps to propose a job or raise a bug:
diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
index 01f145dafbc6..661c700130c7 100644
--- a/contributingGuides/FORMS.md
+++ b/contributingGuides/FORMS.md
@@ -274,6 +274,7 @@ Form.js will automatically provide the following props to any input with the inp
 - onBlur: An onBlur handler that calls validate.
 - onTouched: An onTouched handler that marks the input as touched.
 - onInputChange: An onChange handler that saves draft values and calls validate for that input (inputA). Passing an inputID as a second param allows inputA to manipulate the input value of the provided inputID (inputB).
+- onFocus: An onFocus handler that marks the input as focused.
 
 ## Dynamic Form Inputs
 
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
index e7584f82a351..7e1c1dda4262 100644
--- a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
+++ b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
@@ -1,5 +1,7 @@
 # Expensify PropTypes Conversion Table
 
+This is a reference to help you convert PropTypes to TypeScript types. 
+
 ## Table of Contents
 
 - [Important Considerations](#important-considerations)
diff --git a/desktop/main.js b/desktop/main.js
index b19bef060ba9..5e184d529afd 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -12,7 +12,7 @@ const CONST = require('../src/CONST').default;
 const Localize = require('../src/libs/Localize');
 
 const port = process.env.PORT || 8082;
-const {DESKTOP_SHORTCUT_ACCELERATOR} = CONST;
+const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
 
 app.setName('New Expensify');
 
@@ -36,25 +36,40 @@ function pasteAsPlainText(browserWindow) {
     browserWindow.webContents.insertText(text);
 }
 
-// Initialize the right click menu
-// See https://github.com/sindresorhus/electron-context-menu
-// Add the Paste and Match Style command to the context menu
-contextMenu({
-    append: (defaultActions, parameters, browserWindow) => [
-        new MenuItem({
-            // Only enable the menu item for Editable context which supports paste
-            visible: parameters.isEditable && parameters.editFlags.canPaste,
-            role: 'pasteAndMatchStyle',
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
-        }),
-        new MenuItem({
-            label: Localize.translate(CONST.LOCALES.DEFAULT, 'desktopApplicationMenu.pasteAsPlainText'),
-            visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
-            click: () => pasteAsPlainText(browserWindow),
-        }),
-    ],
-});
+/**
+ * Initialize the right-click menu
+ * See https://github.com/sindresorhus/electron-context-menu
+ *
+ * @param {String} preferredLocale - The current user language to be used for translating menu labels.
+ * @returns {Function} A dispose function to clean up the created context menu.
+ */
+
+function createContextMenu(preferredLocale = LOCALES.DEFAULT) {
+    return contextMenu({
+        labels: {
+            cut: Localize.translate(preferredLocale, 'desktopApplicationMenu.cut'),
+            paste: Localize.translate(preferredLocale, 'desktopApplicationMenu.paste'),
+            copy: Localize.translate(preferredLocale, 'desktopApplicationMenu.copy'),
+        },
+        append: (defaultActions, parameters, browserWindow) => [
+            new MenuItem({
+                // Only enable the menu item for Editable context which supports paste
+                visible: parameters.isEditable && parameters.editFlags.canPaste,
+                role: 'pasteAndMatchStyle',
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAndMatchStyle'),
+            }),
+            new MenuItem({
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAsPlainText'),
+                visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
+                click: () => pasteAsPlainText(browserWindow),
+            }),
+        ],
+    });
+}
+
+let disposeContextMenu = createContextMenu();
 
 // Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
 // See https://www.npmjs.com/package/electron-log
@@ -522,6 +537,8 @@ const mainWindow = () => {
 
                 ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale) => {
                     Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
+                    disposeContextMenu();
+                    disposeContextMenu = createContextMenu(updatedLocale);
                 });
 
                 ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {
diff --git a/docs/Card-Rev-Share-for-Approved-Partners.md b/docs/Expensify-Card-revenue share for ExpensifyApproved!-partners.md
similarity index 58%
rename from docs/Card-Rev-Share-for-Approved-Partners.md
rename to docs/Expensify-Card-revenue share for ExpensifyApproved!-partners.md
index 9b5647a004d3..f9d18da76ef6 100644
--- a/docs/Card-Rev-Share-for-Approved-Partners.md
+++ b/docs/Expensify-Card-revenue share for ExpensifyApproved!-partners.md	
@@ -9,9 +9,14 @@ Start making more with us! We're thrilled to announce a new incentive for our US
 <br>This program is currently only available to US-based ExpensifyApproved! partner accountants.
 
 # How-to
-To benefit from this program, all you need to do is ensure that you are listed as a domain admin on your client's Expensify account. If you're not currently a domain admin, your client can follow the instructions outlined in [our help article](https://community.expensify.com/discussion/5749/how-to-add-and-remove-domain-admins#:~:text=Domain%20Admins%20have%20total%20control,a%20member%20of%20the%20domain.) to assign you this role.
+To benefit from this program, complete the following steps 
+1. Ensure that you are listed as the Primary Contact under your client's domain in Expensify. If you're not currently the Primary Contact for your client, you or your client can follow the instructions outlined in [our help article](https://community.expensify.com/discussion/5749/how-to-add-and-remove-domain-admins#:~:text=Domain%20Admins%20have%20total%20control,a%20member%20of%20the%20domain.) to assign you this role.
+2. Add a Business Bank Account to the Primary Contact account. Follow the instructions in [our help article](https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business) to get a Business Bank Account added. 
+
 # FAQ
 - What if my firm is not permitted to accept revenue share from our clients? <br>
 <br>We understand that different firms may have different policies. If your firm is unable to accept this revenue share, you can pass the revenue share back to your client to give them an additional 0.5% of cash back using your own internal payment tools.<br><br>
+How will I know which clients to pay back? <br>
+<br>Every month you will receive an automated message via new.expensify.com and email providing a breakdown of revenue shared generated per client.<br><br>
 - What if my firm does not wish to participate in the program? <br>
 <br>Please reach out to your assigned partner manager at new.expensify.com to inform them you would not like to accept the revenue share nor do you want to pass the revenue share to your clients. 
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 39d62bb0ea9c..209d14de0f48 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -27,11 +27,11 @@
     <div id="lhn">
 
         <div class="lhn-header">
-            <div id="header-button">
-                <img id="angle-up-icon" src="/assets/images/arrow-up.svg" class="base-icon hide"></img>
-                <img id="bars-icon" src="/assets/images/menu.svg" class="base-icon"></img>
-            </div>
             <div class="flex">
+                <div id="header-button">
+                    <img id="angle-up-icon" src="/assets/images/arrow-up.svg" class="base-icon hide"></img>
+                    <img id="bars-icon" src="/assets/images/menu.svg" class="base-icon"></img>
+                </div>
                 <div>
                     <a href="/">
                         <img src="/assets/images/expensify-help.svg" class="logo" />
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 720bc95c0732..bc9d19bfca11 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -267,8 +267,8 @@ button {
         }
 
         #header-button {
-            position: absolute;
             display: block;
+            padding-right: 24px;
             @include breakpoint($breakpoint-tablet) {
                 display: none;
             }
@@ -281,7 +281,7 @@ button {
             margin-left: auto;
             margin-right: auto;
 
-            @include breakpoint($breakpoint-tablet) {
+            @include breakpoint($breakpoint-desktop) {
                 width: 210px;
                 align-content: normal;
                 display: flex;
diff --git a/docs/articles/other/Card-Rev-Share-for-Approved-Partners.md b/docs/articles/other/Card-Revenue-Share-for-ExpensifyApproved!-Partners.md
similarity index 100%
rename from docs/articles/other/Card-Rev-Share-for-Approved-Partners.md
rename to docs/articles/other/Card-Revenue-Share-for-ExpensifyApproved!-Partners.md
diff --git a/docs/articles/other/Expensify-Chat-For-Admins.md b/docs/articles/other/Expensify-Chat-For-Admins.md
new file mode 100644
index 000000000000..247b2b0e03d0
--- /dev/null
+++ b/docs/articles/other/Expensify-Chat-For-Admins.md
@@ -0,0 +1,26 @@
+---
+title: Expensify Chat for Admins
+description: Best Practices for Admins settings up Expensify Chat
+---
+
+## Overview
+Expensify Chat is an incredible way to build a community and foster long-term relationships between event producers and attendees, or attendees with each other. Admins are a huge factor in the success of the connections built in Expensify Chat during the events, as they are generally the drivers of the conference schedule, and help ensure safety and respect is upheld by all attendees both on and offline.
+
+## Getting Started
+We’ve rounded up some resources to get you set up on Expensify Chat and ready to start connecting with your session attendees:
+- [How to get set up and start using Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-use-chat-in-expensify)
+- [How to format text in Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-format-text)
+- [How to flag content and/or users for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive)
+
+## Admin Best Practices
+In order to get the most out of Expensify Chat, we created a list of best practices for admins to review in order to use the tool to its fullest capabilities.
+
+**During the conference:**
+- At a minimum, send 3 announcements throughout the day to create awareness of any sessions, activations, contests, or parties you want to promote.
+- Communicate with the Expensify Team in the #admins room if you see anything you have questions about or are unsure of to make sure we’re resolving issues together ASAP.
+- As an admin, It’s up to you to help keep your conference community safe and respectful. [Flag any content for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) that does not fit your culture and values to keep chatrooms a positive experience for everyone involved.
+
+**After the conference:**
+- The rooms will all stay open after the conference ends, so encourage speakers to keep engaging as long as the conversation is going in their session room.
+- Continue sharing photos and videos from the event or anything fun in #social as part of a wrap up for everyone.
+- Use the #announce room to give attendees a sneak preview of your next event.
diff --git a/docs/articles/other/Expensify-Chat-For-Conference-Attendees.md b/docs/articles/other/Expensify-Chat-For-Conference-Attendees.md
new file mode 100644
index 000000000000..3d30237dca5a
--- /dev/null
+++ b/docs/articles/other/Expensify-Chat-For-Conference-Attendees.md
@@ -0,0 +1,35 @@
+---
+title: Expensify Chat for Conference Attendees
+description: Best Practices for Conference Attendees
+---
+
+## Overview
+Expensify Chat is the best way to meet and network with other event attendees. No more hunting down your contacts by walking the floor or trying to find someone in crowds at a party. Instead, you can use Expensify Chat to network and collaborate with others throughout the conference.
+
+To help get you set up for a great event, we’ve created a guide to help you get the most out of using Expensify Chat at the event you’re attending.
+
+## Getting Started
+We’ve rounded up some resources to get you set up on Expensify Chat and ready to start connecting with your fellow attendees:
+
+- [How to get set up and start using Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-use-chat-in-expensify)
+- [How to format text in Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-format-text)
+- [How to flag content and/or users for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive)
+
+## Chat Best Practices
+To get the most out of your experience at your conference and engage people in a meaningful conversation that will fulfill your goals instead of turning people off, here are some tips on what to do and not to do as an event attendee using Expensify Chat:
+
+**Do:**
+- Chat about non-business topics like where the best coffee is around the event, what great lunch options are available, or where the parties are happening that night!
+- Share pictures of your travel before the event to hype everyone up, during the event if you met that person you’ve been meaning to see for years, or a fun pic from a party.
+- Try to create fun groups with your fellow attendees around common interests like touring a local sight, going for a morning run, or trying a famous restaurant.
+
+**Don't:**
+- Pitch your services in public rooms like #social or speaking session rooms.
+- Start a first message with a stranger with a sales pitch.
+- Discuss controversial topics such as politics, religion, or anything you wouldn’t say on a first date.
+- In general just remember that you are still here for business, your profile is public, and you’re representing yourself & company, so do not say anything you wouldn’t feel comfortable sharing in a business setting.
+
+**Pro-Tips:**
+Get active in Chat early and often by having real conversations around thought leadership or non-business discussions to stand out from the crowd! Also if you’re in a session and are afraid to ask a question, just ask in the chat room to make sure you can discuss it with the speaker after the session ends.
+
+By following these tips you’ll ensure that your messages will not be [flagged for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) and you will not mess it up for the rest of us.
diff --git a/docs/articles/other/Expensify-Chat-For-Conference-Speakers.md b/docs/articles/other/Expensify-Chat-For-Conference-Speakers.md
new file mode 100644
index 000000000000..5bd52425d92b
--- /dev/null
+++ b/docs/articles/other/Expensify-Chat-For-Conference-Speakers.md
@@ -0,0 +1,39 @@
+---
+title: Expensify Chat for Conference Speakers
+description: Best Practices for Conference Speakers
+---
+
+## Overview
+Are you a speaker at an event? Great! We're delighted to provide you with an extraordinary opportunity to connect with your session attendees using Expensify Chat — before, during, and after the event. Expensify Chat offers a powerful platform for introducing yourself and your topic, fostering engaging discussions about your presentation, and maintaining the conversation with attendees even after your session is over.
+
+## Getting Started
+We’ve rounded up some resources to get you set up on Expensify Chat and ready to start connecting with your session attendees:
+
+- [How to get set up and start using Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-use-chat-in-expensify)
+- [How to format text in Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-format-text)
+- [How to flag content and/or users for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive)
+
+## Setting Up a Chatroom for Your Session: Checklist
+To make the most of Expensify Chat for your session, here's a handy checklist:
+- Confirm that your session has an Expensify Chat room, and have the URL link ready to share with attendees in advance.
+  - You can find the link by clicking on the avatar for your chatroom > “Share Code” > “Copy URL to dashboard”
+- Join the chat room as soon as it's ready to begin engaging with your audience right from the start.
+- Consider having a session moderator with you on the day to assist with questions and discussions while you're presenting.
+- Include the QR code for your session's chat room in your presentation slides. Displaying it prominently on every slide ensures that attendees can easily join the chat throughout your presentation.
+
+## Tips to Enhance Engagement Around Your Session
+By following these steps and utilizing Expensify Chat, you can elevate your session to promote valuable interactions with your audience, and leave a lasting impact beyond the conference. We can't wait to see your sessions thrive with the power of Expensify Chat!
+
+**Before the event:**
+- Share your session's QR code or URL on your social media platforms, your website or other platforms to encourage attendees to join the conversation early on.
+- Encourage attendees to ask questions in the chat room before the event, enabling you to tailor your session and address their specific interests.
+
+**During the event:**
+- Keep your QR code readily available during the conference by saving it as a photo on your phone or setting it as your locked screen image. This way, you can easily share it with others you meet.
+- Guide your audience back to the QR code and encourage them to ask questions, fostering interactive discussions.
+
+**After the event:**
+- Continue engaging with attendees by responding to their questions and comments, helping you expand your audience and sustain interest.
+- Share your presentation slides after the event as well as any photos from your session, allowing attendees to review and share your content with their networks if they want to.
+
+If you have any questions on how Expensify Chat works, head to our guide [here](https://help.expensify.com/articles/other/Everything-About-Chat).
diff --git a/docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md b/docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md
index 2c82c2d04273..8f806bb03146 100644
--- a/docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md
+++ b/docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md
@@ -1,113 +1,93 @@
 ---
-title: Expensify Chat Playbook for Conferences 
+title: Expensify Chat Playbook for Conferences
 description: Best practices for how to deploy Expensify Chat for your conference
 ---
 ## Overview
-
 To help make setting up Expensify Chat for your event and your attendees super simple, we’ve created a guide for all of the technical setup details.
 
-
 ## Who you are
-
-As a conference organizer, you’re expected to amaze and inspire attendees. You want attendees to get to the right place on time, engage with the speakers, and create relationships with each other that last long after the conference is done. Enter Expensify Chat, a free feature that allows attendees to interact with organizers and other attendees in realtime. With Expensify Chat, you can: 
+As a conference organizer, you’re expected to amaze and inspire attendees. You want attendees to get to the right place on time, engage with the speakers, and create relationships with each other that last long after the conference is done. Enter Expensify Chat, a free feature that allows attendees to interact with organizers and other attendees in realtime. With Expensify Chat, you can:
 
 - Communicate logistics and key information
-- Foster conference-wide attendee networking
-- Organize discussions by topic and audience
-- Continue conversations long after the event itself 
+- Foster conference wide attendee networking
+- Organize conversations by topic and audience
+- Continue conversations long after the event itself
 - Digitize attendee social interaction
+- Create an inclusive environment for virtual attendees
 
-Sounds good? Great! In order to ensure your team, speakers, and attendees have the best experience possible, we’ve created a guide on how to use Expensify Chat at your event. 
+Sounds good? Great! In order to ensure your team, your speakers, and your attendees have the best experience possible, we’ve created a guide on how to use Expensify Chat at your event.
 
-_Let’s get started!_
+*Let’s get started!*
 
 
 ## Support
+Connect with your dedicated account manager in any new.expensify.com #admins room. Your account manager is excited to brainstorm the best ways to make the most out of your event and work through any questions you have about the setup steps below.
 
-Connect with your dedicated Expensify account manager in any new.expensify.com #admins room. Your account manager is excited to brainstorm the best ways to make the most out of your event and work through any questions you have about the setup steps below. 
-
-
-## How to set up your conference on Expensify Chat
+We also have a number of [moderation tools](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) available to admins to help make sure your event is seamless, safe, and fun!
 
+## Step by step instructions for setting up your conference on Expensify Chat
 Based on our experience running conferences atop Expensify Chat, we recommend the following simple steps:
 
-### Step 1: Create your event workspace in Expensify 
-
+### Step 1: Create your event workspace in Expensify
 To create your event workspace in Expensify:
-1. In new.expensify.com: “+” > “New workspace” 
-2. Name the workspace (e.g. “ExpensiCon”)
+1. In [new.expensify.com](https://new.expensify.com): “+” > “New workspace”
+1. Name the workspace (e.g. “ExpensiCon”)
 
 ### Step 2: Set up all the Expensify Chat rooms you want to feature at your event
-
-*Protip*: Your Expensify account manager can complete this step with you. Chat them in #admins on new.expensify.com to coordinate!
+**Protip**: Your Expensify account manager can complete this step with you. Chat them in #admins on new.expensify.com to coordinate!
 
 To create a new chat room:
 1. Go to [new.expensify.com](https://new.expensify.com)
-2. Go to “+” > New room  
-3. Name the room (e.g. “#social”)
-4. Select the workspace created in step 1
-5. Select “Public” visibility 
-6. “Create room” > Copy/Paste room URL for use later
-7. Repeat for each room
+1. Go to “+” > New room
+1. Name the room (e.g. “#social”)
+1. Select the workspace created in step 1
+1. Select “Public” visibility
+1. Repeat for each room
 
 For an easy-to-follow event, we recommend creating these chat rooms:
 
-- *#announce* - This room will be used as your main announcement channel, and should only be used by organizers to announce schedule updates or anything important that your attendees need to know. Everyone in your policy will be invited to this channel, but chatting in here isn’t encouraged -- so to keep the noise to a minimum!
-- *#social* - This room will include all attendees, speakers, and members of your organizing team. You can use this room to discuss social events, happy hours, dinners, or encourage attendees to mingle, share photos and connect. 
-- *Create an individual room for each session* - Attendees will be able to engage with the speaker/session leader and can ask questions about their content either before/during/after the session.
-- *Create a room with your Expensify account manager/s* - We can use this room to coordinate using Expensify Chat before, during, and after the event. 
+- **#social** - This room will include all attendees, speakers, and members of your organizing team. You can use this room to discuss social events, happy hours, dinners, or encourage attendees to mingle, share photos and connect.
+- **#announcements** - This room will be used as your main announcement channel, and should only be used by organizers to announce schedule updates or anything important that your attendees need to know. Everyone in your policy will be invited to this channel, but chatting in here isn’t encouraged so to keep the noise to a minimum.
+- **Create an individual room for each session** - Attendees will be able to engage with the speaker/session leader and can ask questions about their content either before/during/after the session.
+- **Create a room with your Expensify account manager/s** - We can use this room to coordinate using Expensify Chat before, during, and after the event.
 
-### Step 3: Add chat room QR codes to the applicable session slide deck
+**Protip** Check out our [moderation tools](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) to help flag comments deemed to be spam, inconsiderate, intimidating, bullying, harassment, assault. On any comment just click the flag icon to moderate conversation.
 
+### Step 3: Add chat room QR codes to the applicable session slide deck
 Gather QR codes:
 1. Go to [new.expensify.com](https://new.expensify.com)
-2. Click into a room and click the room name or avatar in the top header
-3. Go into Share Code
-4. Download or screenshot the QR code image
-
-Add the QR code to every slide so that if folks forget to scan the QR code at the beginning of the presentation, they can still join the discussion. 
-
-### Step 4: Train speakers on how to use chat during their sessions
-
-*Protip*: Copy and paste a link to this section and share it directly with your speakers
-*Protip*: Your account manager can communicate this training to your speakers. Chat with them in #admins on new.expensify.com to coordinate!
-
-Are you a speaker at an event? Great! Expensify Chat is the perfect way to connect with your session attendees before, during, and after the event. Use Expensify Chat to introduce yourself and your topic, and open the floor for attendees to ask questions and participate in discussion about your presentation, as well as connect with other attendees that were in the room. Here’s a quick list to help you best prepare for your session by using Expensify Chat: 
-
-1. Ensure your session has an Expensify Chat room and that you know the URL link to your session so you can share with attendees ahead of time
-2. Join the chat room ahead of the event so you can start engaging with your session’s attendees from the get-go
-3. Make sure you have a session moderator with you on presentation day to help moderate questions and facilitate discussion while you’re busy speaking
-4. Ensure your session slides include the QR code for your session chat room. We’d recommend making sure the QR code is visible on every page of your deck in case an attendee didn’t join at the beginning. 
-5. Engage with attendees after your session to continue the discussion around your topic!
-
-*Messaging Suggestions*
-
-- Default: Welcome to [CONFERENCE NAME]! This is the [SESSION TITLE] chat room. Please use this room to chat with each other, submit questions about today's presentation, and to chat directly with [SPEAKER NAME] after the session wraps up.
-- Custom: As part of pre-conference speaker outreach we should allow speakers to change this message and use the default if they don’t respond.”
-
-### Step 5: Plan out your messaging and cadence before the event begins
-
-Expensify Chat is a great place to provide updates leading up to your event -- share news, get folks excited about speakers, and let attendees know about crucial event information like recommended attire, travel info, and more.
+1. Click into a room and click the room name or avatar in the top header
+1. Go into Share Code
+1. Screenshot the QR code to add to your deck
 
-### Step 6: Update your rooms throughout the event 
+Add the QR code to every slide so that if folks forget to scan the QR code at the beginning of the presentation, they can still join the discussion.
 
-We find chat to be a powerful way to not only engage your attendees, but direct them in realtime to get exactly where they need to go:
+### Step 4: Plan out your messaging and cadence before the event begins
+Expensify Chat is a great place to provide updates leading up to your event -- share news, get folks excited about speakers, and let attendees know of crucial event information like recommended attire, travel info, and more. For example, you might consider:
 
-- #announce: Use this room to make announcements such as what’s coming up next, where and when social events are taking place, or announcing the sponsor floor is open to the entire conference. Only workspace admins can post in this room.
-- #social: Have your employees in this room sharing fun photos, stoking conversations, and responding to any questions or feedback.
-- Speaker rooms: Encourage your employees to jump in to comment on content and nudge attendees to engage with each other during sessions.
+**Prep your announcements:**
+- Create a document containing drafts of the key messages you intend to send throughout the day.
+- If your event's agenda is broken up into hourly blocks, create a separate section for each hour of the event, to make it easy to find the correct section at the right time.
+- Start each day with a review of the daily agenda, such as a bullet list summarizing what's happening hour by hour.
 
-*Protip*: Expensify Chat has [moderation tools](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) to help flag comments deemed to be spam, inconsiderate, intimidating, bullying, harassment, assault. On any comment, just click the flag icon to moderate conversation. 
+**Post your updates:**
+- Designate a team member to post each update in #announce at the designated time.
+- Each hour, send a message listing exactly what is happening next – if there are multiple sessions happening simultaneously, list out each, along with a description of the session, a reminder of where it's located, and (most importantly) a link to the chat room for that session
+- Write the messages in [markdown format](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-format-text), such that they can be copy/pasted directly into Expensify Chat for sending.
+  - If there is some formatting issue upon posting, no problem: just edit the comment after sending, and it'll be fixed for everyone.
+- We’d also recommend posting your updates on new lines so that if someone has a question about a certain item they can ask in a thread pertaining to that topic, rather than in one consolidated block.
 
-### Step 7: Follow up with attendees after the event
+**Protip**: Your account manager can help you create this document, and would be happy to send each message at the appointed time for you.
 
-Continue the connections by using Expensify Chat to keep your conference community connected. Encourage attendees to share photos, their favorite memories, funny stories, and more. 
+### Step 5: Share Expensify Chat How-To Resources with Speakers, Attendees, Admins
+We’ve created a few helpful best practice docs for your speakers, admins, and attendees to help navigate using Expensify Chat at your event. Feel free to share the links below with them!
 
-- We’d recommend creating a draft of all of your reminders that you plan to send in the #announce (or #social) room throughout the event. 
-- A post in the morning outlining the full agenda, and then before each event as it happens throughout the day, is recommended. Be sure to include details like timings, locations, and any special detail like attire to help attendees feel prepared.
-- Use markdown when posting updates so that your messages are easy to read.
-- We also recommend posting your updates on new lines so that if someone has a question about a certain item they can ask in a thread pertaining to that topic, rather than in one consolidated block. 
+- [Expensify Chat for Conference Attendees](https://help.expensify.com/articles/other/Expensify-Chat-For-Conference-Attendees)
+- [Expensify Chat for Conference Speakers](https://help.expensify.com/articles/other/Expensify-Chat-For-Conference-Speakers)
+- [Expensify Chat for Admins](https://help.expensify.com/articles/other/Expensify-Chat-For-Admins)
 
-## You’re all set!
+### Step 6: Follow up with attendees after the event
+Continue the connections by using Expensify Chat to keep your conference community connected. Encourage attendees to share photos, their favorite memories, funny stories, and more.
 
-Once you've completed the above steps, you're ready to host your conference on Expensify Chat! Any questions? Just reach out to your Expensify account manager in your new.expensify.com #admins room.
+## Conclusion
+Once you have completed the above steps you are ready to host your conference on Expensify Chat! Let your account manager know any questions you have over in your [new.expensify.com](https://new.expensify.com) #admins room and start driving activity in your Expensify Chat rooms. Once you’ve reviewed this doc you should have the foundations in place, so a great next step is to start training your speakers on how to use Expensify Chat for their sessions. Coordinate with your account manager to make sure everything goes smoothly!
diff --git a/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md b/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md
index 849932a33c2d..a4004dbe1b88 100644
--- a/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md
+++ b/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md
@@ -209,7 +209,7 @@ Here’s how to enable it:
       - *Employees* - We recommend a low limit for most employees, roughly double the size of the maximum daily spend – such as $1000.  
       - *Execs* - We recommend a higher limit for executives, roughly 10x the limit of a non-executive employee (eg, $10,000).
 
-Once the Expensify Cards have been assigned, each employee will be prompted to enter their mailing address so they can receive their physical card. In the meantime, a digital card will be ready to use immediately.
+Once the Expensify Cards have been assigned, each employee will be prompted to enter their mailing address so they can receive their physical card. In the meantime, a virtual card will be ready to use immediately.
 
 If you have an accounting system we directly integrate with, check out how we take automation a step further with [Continuous Reconciliation](https://community.expensify.com/discussion/7335/faq-what-is-the-expensify-card-auto-reconciliation-process). We’ll create an Expensify Card clearing and liability account for you. Each time settlement occurs, we’ll take the total amount of your purchases and create a journal entry that credits the settlement account and debits the liability account - saving you hours of manual reconciliation work at the end of your statement period. 
 
diff --git a/docs/articles/request-money/Request-and-Split-Bills.md b/docs/articles/request-money/Request-and-Split-Bills.md
index a2c63cf6f8f7..bb27cd75c742 100644
--- a/docs/articles/request-money/Request-and-Split-Bills.md
+++ b/docs/articles/request-money/Request-and-Split-Bills.md
@@ -16,7 +16,10 @@ These two features ensure you can live in the moment and settle up afterward.
 
 # How to Request Money
 - Select the Green **+** button and choose **Request Money**
-- Enter the amount **$** they owe and click **Next**
+- Select the relevant option: 
+    - **Manual:** Enter the merchant and amount manually.
+    - **Scan:** Take a photo of the receipt to have the merchant and amount auto-filled.
+    - **Distance:** Enter the details of your trip, plus any stops along the way, and the mileage and amount will be automatically calculated.
 - Search for the user or enter their email!
 - Enter a reason for the request (optional)
 - Click **Request!**
diff --git a/docs/assets/images/insights-chart.png b/docs/assets/images/insights-chart.png
index 7b10c8c92d8d..4b21b8d70a09 100644
Binary files a/docs/assets/images/insights-chart.png and b/docs/assets/images/insights-chart.png differ
diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js
index 01ebb00b288c..f0f335536c20 100644
--- a/docs/assets/js/main.js
+++ b/docs/assets/js/main.js
@@ -206,13 +206,6 @@ window.addEventListener('DOMContentLoaded', () => {
 
             // If there is a fixed article scroll container, set to calculate titles' offset
             scrollContainer: 'content-area',
-
-            // onclick function to apply to all links in toc. will be called with
-            // the event as the first parameter, and this can be used to stop,
-            // propagation, prevent default or perform action
-            onClick() {
-                toggleHeaderMenu();
-            },
         });
     }
 
@@ -226,6 +219,18 @@ window.addEventListener('DOMContentLoaded', () => {
 
     const articleContent = document.getElementById('article-content');
     const lhnContent = document.getElementById('lhn-content');
+
+    // This event listener checks if a link clicked in the LHN points to some section of the same page and toggles
+    // the LHN menu in responsive view.
+    lhnContent.addEventListener('click', (event) => {
+        const clickedLink = event.target;
+        if (clickedLink) {
+            const href = clickedLink.getAttribute('href');
+            if (href && href.startsWith('#') && !!document.getElementById(href.slice(1))) {
+                toggleHeaderMenu();
+            }
+        }
+    });
     lhnContent.addEventListener('wheel', (e) => {
         const scrollTop = lhnContent.scrollTop;
         const isScrollingPastLHNTop = e.deltaY < 0 && scrollTop === 0;
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 57cac59e6dd8..dac53193fdc6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -67,6 +67,8 @@ platform :android do
   desc "Build and upload app to Google Play"
   lane :beta do
     ENV["ENVFILE"]=".env.production"
+    # Google is very unreliable, so we retry a few times
+    ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
 
     gradle(
         project_dir: './android',
@@ -86,6 +88,8 @@ platform :android do
 
   desc "Deploy app to Google Play production"
   lane :production do
+    # Google is very unreliable, so we retry a few times
+    ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
     google_play_track_version_codes(
       package_name: "com.expensify.chat",
       json_key: './android/app/android-fastlane-json-key.json',
@@ -224,11 +228,11 @@ platform :ios do
               contact_phone: ENV["APPLE_CONTACT_PHONE"],
               demo_account_name: ENV["APPLE_DEMO_EMAIL"],
               demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
-              notes: "1. Log into the Expensify app using the provided email
-                      2. Now, you have to log in to this gmail account on https://mail.google.com/ so you can retrieve a One-Time-Password
-                      3. To log in to the gmail account, use the password above (That's NOT a password for the Expensify app but for the Gmail account)
-                      4. At the Gmail inbox, you should have received a one-time 6 digit magic code
-                      5. Use that to sign in"
+              notes: "1. In the Expensify app, enter the email 'appletest.expensify@proton.me'. This will trigger a sign-in link to be sent to 'appletest.expensify@proton.me'
+                      2. Navigate to https://account.proton.me/login, log into Proton Mail using 'appletest.expensify@proton.me' as email and the password associated with 'appletest.expensify@proton.me', provided above
+                      3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'
+                      4. Open the email and copy the 6-digit sign-in code provided within
+                      5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
           }
       )
     rescue Exception => e
diff --git a/ios/Certificates.p12.gpg b/ios/Certificates.p12.gpg
index c4a68891f6e4..f63d6861f888 100644
Binary files a/ios/Certificates.p12.gpg and b/ios/Certificates.p12.gpg differ
diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index d87226269a8b..64ed3fda8b02 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		02BE6CF80ED1BD2445267F92 /* Pods-NewExpensify.release development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release development.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release development.xcconfig"; sourceTree = "<group>"; };
 		0B09CE5BDAF34DD3573AB4E2 /* Pods-NewExpensify.debug adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug adhoc.xcconfig"; sourceTree = "<group>"; };
+		0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugdevelopment.xcconfig"; sourceTree = "<group>"; };
 		0CDA8E33287DD650004ECBEC /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = NewExpensify/AppDelegate.mm; sourceTree = "<group>"; };
 		0CDA8E36287DD6A0004ECBEC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = NewExpensify/Images.xcassets; sourceTree = "<group>"; };
 		0E27AA27706D894246E7946D /* Pods-NewExpensify.debug production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug production.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug production.xcconfig"; sourceTree = "<group>"; };
@@ -64,38 +65,49 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NewExpensify/main.m; sourceTree = "<group>"; };
 		18D050DF262400AF000D658B /* BridgingFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgingFile.swift; sourceTree = "<group>"; };
 		1DDE5449979A136852B939B5 /* Pods-NewExpensify.release adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release adhoc.xcconfig"; sourceTree = "<group>"; };
+		25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; sourceTree = "<group>"; };
+		30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releasedevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releasedevelopment.xcconfig"; sourceTree = "<group>"; };
 		34A8FDD1F9AA58B8F15C8380 /* Pods-NewExpensify.release production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release production.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release production.xcconfig"; sourceTree = "<group>"; };
 		374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OriginImageRequestHandler.h; path = NewExpensify/OriginImageRequestHandler.h; sourceTree = "<group>"; };
 		374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OriginImageRequestHandler.mm; path = NewExpensify/OriginImageRequestHandler.mm; sourceTree = "<group>"; };
 		3D393D7ABC1092F1DE91397F /* Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig"; sourceTree = "<group>"; };
 		432FF5842B766535509FC547 /* Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig"; sourceTree = "<group>"; };
 		44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = "<group>"; };
+		47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releaseproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releaseproduction.xcconfig"; sourceTree = "<group>"; };
+		4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig"; sourceTree = "<group>"; };
 		52796131E6554494B2DDB056 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = "<group>"; };
+		57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig"; sourceTree = "<group>"; };
 		6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig"; sourceTree = "<group>"; };
 		6BE16DA6EFF88513DB1CD47B /* Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig"; sourceTree = "<group>"; };
+		6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugadhoc.xcconfig"; sourceTree = "<group>"; };
 		6FB387B20AE4E6E98858B6AA /* libPods-NewExpensify-NewExpensifyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify-NewExpensifyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = "<group>"; };
 		7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = "<group>"; };
 		70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = "<group>"; };
 		75CABB0D0ABB0082FE0EB600 /* Pods-NewExpensify.release staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release staging.xcconfig"; sourceTree = "<group>"; };
+		8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; sourceTree = "<group>"; };
 		8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/native/ExpensifyNeue-BoldItalic.otf"; sourceTree = "<group>"; };
 		8D3B36BF88E773E3C1A383FA /* Pods-NewExpensify.debug staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug staging.xcconfig"; sourceTree = "<group>"; };
 		96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release production.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release production.xcconfig"; sourceTree = "<group>"; };
 		AEFE6CD54912D427D19133C7 /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BD6E1BA27D6ABE0AC9D70586 /* Pods-NewExpensify-NewExpensifyTests.release development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release development.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release development.xcconfig"; sourceTree = "<group>"; };
+		BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releaseadhoc.xcconfig"; sourceTree = "<group>"; };
 		BF6A4C5167244B9FB8E4D4E3 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/native/ExpensifyNeue-Italic.otf"; sourceTree = "<group>"; };
+		CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugproduction.xcconfig"; sourceTree = "<group>"; };
 		CECC4CBB97A55705A33BEA9E /* Pods-NewExpensify.debug development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug development.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug development.xcconfig"; sourceTree = "<group>"; };
 		D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = "<group>"; };
 		DB76E0D5C670190A0997C71E /* Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig"; sourceTree = "<group>"; };
 		DCF33E34FFEC48128CDD41D4 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/native/ExpensifyMono-Bold.otf"; sourceTree = "<group>"; };
 		DD7904292792E76D004484B4 /* RCTBootSplash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTBootSplash.h; path = NewExpensify/RCTBootSplash.h; sourceTree = "<group>"; };
 		DD79042A2792E76D004484B4 /* RCTBootSplash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTBootSplash.m; path = NewExpensify/RCTBootSplash.m; sourceTree = "<group>"; };
+		E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig"; sourceTree = "<group>"; };
 		E2F1036F70CBFE39E9352674 /* Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig"; sourceTree = "<group>"; };
 		E704648954784DDFBAADF568 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/native/ExpensifyMono-Regular.otf"; sourceTree = "<group>"; };
 		E9DF872C2525201700607FDC /* AirshipConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AirshipConfig.plist; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 		F0C450E92705020500FD2970 /* colors.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = colors.json; path = ../colors.json; sourceTree = "<group>"; };
+		F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; sourceTree = "<group>"; };
 		F4F8A052A22040339996324B /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/native/ExpensifyNeue-Regular.otf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -239,6 +251,18 @@
 				6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */,
 				6BE16DA6EFF88513DB1CD47B /* Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig */,
 				96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */,
+				0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */,
+				6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */,
+				CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */,
+				30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */,
+				BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */,
+				47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */,
+				8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */,
+				25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */,
+				F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */,
+				4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */,
+				E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */,
+				57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -641,9 +665,9 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		00E356F61AD99517003FC87E /* Debug Development */ = {
+		00E356F61AD99517003FC87E /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E2F1036F70CBFE39E9352674 /* Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig */;
+			baseConfigurationReference = 8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -664,11 +688,11 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		00E356F71AD99517003FC87E /* Release Development */ = {
+		00E356F71AD99517003FC87E /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BD6E1BA27D6ABE0AC9D70586 /* Pods-NewExpensify-NewExpensifyTests.release development.xcconfig */;
+			baseConfigurationReference = 4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -687,11 +711,11 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		13B07F941A680F5B00A75B9A /* Debug Development */ = {
+		13B07F941A680F5B00A75B9A /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CECC4CBB97A55705A33BEA9E /* Pods-NewExpensify.debug development.xcconfig */;
+			baseConfigurationReference = 0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -719,11 +743,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		13B07F951A680F5B00A75B9A /* Release Development */ = {
+		13B07F951A680F5B00A75B9A /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 02BE6CF80ED1BD2445267F92 /* Pods-NewExpensify.release development.xcconfig */;
+			baseConfigurationReference = 30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -749,9 +773,9 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		83CBBA201A601CBA00E9B192 /* Debug Development */ = {
+		83CBBA201A601CBA00E9B192 /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -814,9 +838,9 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		83CBBA211A601CBA00E9B192 /* Release Development */ = {
+		83CBBA211A601CBA00E9B192 /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -873,9 +897,9 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		CF9AF93E29EE9276001FA527 /* Debug Production */ = {
+		CF9AF93E29EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -938,11 +962,11 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF93F29EE9276001FA527 /* Debug Production */ = {
+		CF9AF93F29EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0E27AA27706D894246E7946D /* Pods-NewExpensify.debug production.xcconfig */;
+			baseConfigurationReference = CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -970,11 +994,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF94029EE9276001FA527 /* Debug Production */ = {
+		CF9AF94029EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = DB76E0D5C670190A0997C71E /* Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig */;
+			baseConfigurationReference = F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -995,9 +1019,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF94429EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94429EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1060,11 +1084,11 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94529EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94529EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0B09CE5BDAF34DD3573AB4E2 /* Pods-NewExpensify.debug adhoc.xcconfig */;
+			baseConfigurationReference = 6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconAdHoc;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1092,11 +1116,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94629EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94629EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 432FF5842B766535509FC547 /* Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig */;
+			baseConfigurationReference = 25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1117,9 +1141,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94729EE928E001FA527 /* Release Production */ = {
+		CF9AF94729EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1176,11 +1200,11 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94829EE928E001FA527 /* Release Production */ = {
+		CF9AF94829EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34A8FDD1F9AA58B8F15C8380 /* Pods-NewExpensify.release production.xcconfig */;
+			baseConfigurationReference = 47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1206,11 +1230,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94929EE928E001FA527 /* Release Production */ = {
+		CF9AF94929EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */;
+			baseConfigurationReference = 57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1229,9 +1253,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94D29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94D29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1288,11 +1312,11 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
-		CF9AF94E29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94E29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1DDE5449979A136852B939B5 /* Pods-NewExpensify.release adhoc.xcconfig */;
+			baseConfigurationReference = BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconAdHoc;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1318,11 +1342,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
-		CF9AF94F29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94F29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */;
+			baseConfigurationReference = E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1341,7 +1365,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
 /* End XCBuildConfiguration section */
 
@@ -1349,41 +1373,41 @@
 		00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "NewExpensifyTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				00E356F61AD99517003FC87E /* Debug Development */,
-				CF9AF94629EE927A001FA527 /* Debug AdHoc */,
-				CF9AF94029EE9276001FA527 /* Debug Production */,
-				00E356F71AD99517003FC87E /* Release Development */,
-				CF9AF94F29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94929EE928E001FA527 /* Release Production */,
+				00E356F61AD99517003FC87E /* DebugDevelopment */,
+				CF9AF94629EE927A001FA527 /* DebugAdHoc */,
+				CF9AF94029EE9276001FA527 /* DebugProduction */,
+				00E356F71AD99517003FC87E /* ReleaseDevelopment */,
+				CF9AF94F29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94929EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "NewExpensify" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				13B07F941A680F5B00A75B9A /* Debug Development */,
-				CF9AF94529EE927A001FA527 /* Debug AdHoc */,
-				CF9AF93F29EE9276001FA527 /* Debug Production */,
-				13B07F951A680F5B00A75B9A /* Release Development */,
-				CF9AF94E29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94829EE928E001FA527 /* Release Production */,
+				13B07F941A680F5B00A75B9A /* DebugDevelopment */,
+				CF9AF94529EE927A001FA527 /* DebugAdHoc */,
+				CF9AF93F29EE9276001FA527 /* DebugProduction */,
+				13B07F951A680F5B00A75B9A /* ReleaseDevelopment */,
+				CF9AF94E29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94829EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "NewExpensify" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				83CBBA201A601CBA00E9B192 /* Debug Development */,
-				CF9AF94429EE927A001FA527 /* Debug AdHoc */,
-				CF9AF93E29EE9276001FA527 /* Debug Production */,
-				83CBBA211A601CBA00E9B192 /* Release Development */,
-				CF9AF94D29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94729EE928E001FA527 /* Release Production */,
+				83CBBA201A601CBA00E9B192 /* DebugDevelopment */,
+				CF9AF94429EE927A001FA527 /* DebugAdHoc */,
+				CF9AF93E29EE9276001FA527 /* DebugProduction */,
+				83CBBA211A601CBA00E9B192 /* ReleaseDevelopment */,
+				CF9AF94D29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94729EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme
index 0e0fad6399a0..6cd590456eed 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme	
@@ -57,7 +57,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug AdHoc"
+      buildConfiguration = "DebugAdHoc"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
@@ -75,7 +75,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug AdHoc"
+      buildConfiguration = "DebugAdHoc"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -96,7 +96,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release AdHoc"
+      buildConfiguration = "ReleaseAdHoc"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -113,10 +113,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug AdHoc">
+      buildConfiguration = "DebugAdHoc">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release AdHoc"
+      buildConfiguration = "ReleaseAdHoc"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme
index 77f512242f67..93d775217f11 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme	
@@ -23,7 +23,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug Development"
+      buildConfiguration = "DebugDevelopment"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug Development"
+      buildConfiguration = "DebugDevelopment"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -62,7 +62,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release Development"
+      buildConfiguration = "ReleaseDevelopment"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -79,10 +79,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug Development">
+      buildConfiguration = "DebugDevelopment">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release Development"
+      buildConfiguration = "ReleaseDevelopment"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme
index f68be2705527..b6b5874506a8 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme	
@@ -75,7 +75,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -96,7 +96,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -113,10 +113,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug Production">
+      buildConfiguration = "DebugProduction">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       customArchiveName = "New Expensify"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c48f882766db..2c5d83188b3c 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.3.60</string>
+	<string>1.3.71</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.60.1</string>
+	<string>1.3.71.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
@@ -108,6 +108,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -117,8 +119,6 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Dark</string>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b9f0b9e62ec6..3e4626ad2766 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.3.60</string>
+	<string>1.3.71</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.60.1</string>
+	<string>1.3.71.7</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
index 6445685db014..b30510572448 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -22,7 +22,7 @@ prepare_react_native_project!
 #   dependencies: {
 #     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
 # ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['Debug Production', 'Debug Development', 'Debug AdHoc'])
+flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['DebugProduction', 'DebugDevelopment', 'DebugAdHoc'])
 
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
@@ -54,12 +54,12 @@ target 'NewExpensify' do
   permissions_path = '../node_modules/react-native-permissions/ios'
 
   project 'NewExpensify',
-    'Debug Development' => :debug,
-    'Debug AdHoc' => :debug,
-    'Debug Production' => :debug,
-    'Release Development' => :release,
-    'Release AdHoc' => :release,
-    'Release Production' => :release
+    'DebugDevelopment' => :debug,
+    'DebugAdHoc' => :debug,
+    'DebugProduction' => :debug,
+    'ReleaseDevelopment' => :release,
+    'ReleaseAdHoc' => :release,
+    'ReleaseProduction' => :release
 
   pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
   pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 16ed1e05dc64..b2e555dcfae6 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -591,9 +591,9 @@ PODS:
     - React-Core
   - react-native-pager-view (6.2.0):
     - React-Core
-  - react-native-pdf (6.6.2):
+  - react-native-pdf (6.7.1):
     - React-Core
-  - react-native-performance (4.0.0):
+  - react-native-performance (5.1.0):
     - React-Core
   - react-native-plaid-link-sdk (10.0.0):
     - Plaid (~> 4.1.0)
@@ -815,7 +815,7 @@ PODS:
   - RNScreens (3.21.0):
     - React-Core
     - React-RCTImage
-  - RNSVG (13.9.0):
+  - RNSVG (13.13.0):
     - React-Core
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
@@ -1254,8 +1254,8 @@ SPEC CHECKSUMS:
   react-native-key-command: c2645ec01eb1fa664606c09480c05cb4220ef67b
   react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
   react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
-  react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
-  react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
+  react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae
+  react-native-performance: cef2b618d47b277fb5c3280b81a3aad1e72f2886
   react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
   react-native-quick-sqlite: bcc7a7a250a40222f18913a97cd356bf82d0a6c4
   react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
@@ -1300,7 +1300,7 @@ SPEC CHECKSUMS:
   RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
   RNReanimated: 020859659f64be2d30849a1fe88c821a7c3e0cbf
   RNScreens: d037903436160a4b039d32606668350d2a808806
-  RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
+  RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
@@ -1309,6 +1309,6 @@ SPEC CHECKSUMS:
   Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 845537d35601574adcd0794e17003ba7dbccdbfd
+PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14
 
 COCOAPODS: 1.12.1
diff --git a/ios/chat_expensify_adhoc.mobileprovision.gpg b/ios/chat_expensify_adhoc.mobileprovision.gpg
deleted file mode 100644
index 97179c8a65ac..000000000000
Binary files a/ios/chat_expensify_adhoc.mobileprovision.gpg and /dev/null differ
diff --git a/ios/chat_expensify_appstore.mobileprovision.gpg b/ios/chat_expensify_appstore.mobileprovision.gpg
index 39137ea24a07..246f5f0ec99e 100644
Binary files a/ios/chat_expensify_appstore.mobileprovision.gpg and b/ios/chat_expensify_appstore.mobileprovision.gpg differ
diff --git a/ios/expensify_chat_adhoc.mobileprovision.gpg b/ios/expensify_chat_adhoc.mobileprovision.gpg
index 1464356e423e..8160fba0cfa9 100644
Binary files a/ios/expensify_chat_adhoc.mobileprovision.gpg and b/ios/expensify_chat_adhoc.mobileprovision.gpg differ
diff --git a/ios/expensify_chat_dev.mobileprovision.gpg b/ios/expensify_chat_dev.mobileprovision.gpg
deleted file mode 100644
index 3b8b96b2c142..000000000000
Binary files a/ios/expensify_chat_dev.mobileprovision.gpg and /dev/null differ
diff --git a/package-lock.json b/package-lock.json
index 0047984a3dbf..da2021d75d01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,17 @@
 {
   "name": "new.expensify",
-  "version": "1.3.60-1",
+  "version": "1.3.71-7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.60-1",
+      "version": "1.3.71-7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@expensify/react-native-web": "0.18.15",
+        "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-getcanonicallocales": "^2.2.0",
         "@formatjs/intl-listformat": "^7.2.2",
         "@formatjs/intl-locale": "^3.3.0",
@@ -18,6 +19,8 @@
         "@formatjs/intl-pluralrules": "^5.2.2",
         "@gorhom/portal": "^1.0.14",
         "@invertase/react-native-apple-authentication": "^2.2.2",
+        "@kie/act-js": "^2.0.1",
+        "@kie/mock-github": "^1.0.0",
         "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52",
         "@onfido/react-native-sdk": "7.4.0",
         "@react-native-async-storage/async-storage": "^1.17.10",
@@ -36,6 +39,7 @@
         "@react-navigation/stack": "6.3.16",
         "@react-ng/bounds-observer": "^0.2.1",
         "@rnmapbox/maps": "^10.0.11",
+        "@types/node": "^18.14.0",
         "@ua/react-native-airship": "^15.2.6",
         "awesome-phonenumber": "^5.4.0",
         "babel-plugin-transform-remove-console": "^6.9.4",
@@ -46,7 +50,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#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
         "fbjs": "^3.0.2",
         "htmlparser2": "^7.2.0",
         "idb-keyval": "^6.2.1",
@@ -60,11 +64,12 @@
         "patch-package": "^8.0.0",
         "process": "^0.11.10",
         "prop-types": "^15.7.2",
-        "pusher-js": "7.4.0",
+        "pusher-js": "8.3.0",
         "react": "18.2.0",
         "react-collapse": "^5.1.0",
         "react-content-loader": "^6.1.0",
         "react-dom": "18.1.0",
+        "react-error-boundary": "^4.0.11",
         "react-map-gl": "^7.1.3",
         "react-native": "0.72.3",
         "react-native-blob-util": "^0.17.3",
@@ -76,7 +81,7 @@
         "react-native-fast-image": "^8.6.3",
         "react-native-fs": "^2.20.0",
         "react-native-gesture-handler": "2.12.0",
-        "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+        "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#fd212e1e93cad72e97efad03893bea6d074d3e07",
         "react-native-haptic-feedback": "^1.13.0",
         "react-native-image-pan-zoom": "^2.1.12",
         "react-native-image-picker": "^5.1.0",
@@ -85,10 +90,10 @@
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "1.0.70",
+        "react-native-onyx": "1.0.77",
         "react-native-pager-view": "^6.2.0",
         "react-native-pdf": "^6.7.1",
-        "react-native-performance": "^4.0.0",
+        "react-native-performance": "^5.1.0",
         "react-native-permissions": "^3.0.1",
         "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
         "react-native-plaid-link-sdk": "^10.0.0",
@@ -98,7 +103,7 @@
         "react-native-render-html": "6.3.1",
         "react-native-safe-area-context": "4.4.1",
         "react-native-screens": "3.21.0",
-        "react-native-svg": "^13.9.0",
+        "react-native-svg": "^13.13.0",
         "react-native-tab-view": "^3.5.2",
         "react-native-url-polyfill": "^2.0.0",
         "react-native-view-shot": "^3.6.0",
@@ -106,7 +111,6 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.10",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -129,6 +133,8 @@
         "@babel/runtime": "^7.20.0",
         "@electron/notarize": "^1.2.3",
         "@jest/globals": "^29.5.0",
+        "@kie/act-js": "^2.0.1",
+        "@kie/mock-github": "^1.0.0",
         "@octokit/core": "4.0.4",
         "@octokit/plugin-paginate-rest": "3.1.0",
         "@octokit/plugin-throttling": "4.1.0",
@@ -180,8 +186,8 @@
         "css-loader": "^6.7.2",
         "diff-so-fancy": "^1.3.0",
         "dotenv": "^16.0.3",
-        "electron": "^25.4.0",
-        "electron-builder": "24.5.0",
+        "electron": "^25.8.1",
+        "electron-builder": "24.6.4",
         "eslint": "^7.6.0",
         "eslint-config-airbnb-typescript": "^17.1.0",
         "eslint-config-expensify": "^2.0.38",
@@ -222,7 +228,8 @@
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.9.3",
         "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-merge": "^5.8.0"
+        "webpack-merge": "^5.8.0",
+        "yaml": "^2.2.1"
       },
       "engines": {
         "node": "16.15.1",
@@ -2954,9 +2961,9 @@
       }
     },
     "node_modules/@electron/osx-sign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.4.tgz",
-      "integrity": "sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
+      "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
       "dev": true,
       "dependencies": {
         "compare-version": "^0.1.2",
@@ -3000,171 +3007,10 @@
         "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
-    "node_modules/@electron/rebuild": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.2.13.tgz",
-      "integrity": "sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g==",
-      "dev": true,
-      "dependencies": {
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "chalk": "^4.0.0",
-        "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.7.0",
-        "node-abi": "^3.0.0",
-        "node-api-version": "^0.1.4",
-        "node-gyp": "^9.0.0",
-        "ora": "^5.1.0",
-        "semver": "^7.3.5",
-        "tar": "^6.0.5",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "electron-rebuild": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/@electron/rebuild/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@electron/rebuild/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/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==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@electron/rebuild/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/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/@electron/universal": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz",
-      "integrity": "sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz",
+      "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==",
       "dev": true,
       "dependencies": {
         "@electron/asar": "^3.2.1",
@@ -3179,28 +3025,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/@electron/universal/node_modules/@malept/cross-spawn-promise": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/malept"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
-        }
-      ],
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
@@ -3872,6 +3696,33 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@formatjs/intl-datetimeformat": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.10.0.tgz",
+      "integrity": "sha512-5tJWZxOyP5D4PDrqv27h0LWAPHhQM9BHR0pDBTZOKWFEZNrS2IgREbyalSGwQLtN1tZaDrt3YeNfNLbZk1wSUw==",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "1.17.0",
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@formatjs/intl-datetimeformat/node_modules/@formatjs/ecma402-abstract": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz",
+      "integrity": "sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==",
+      "dependencies": {
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@formatjs/intl-datetimeformat/node_modules/@formatjs/intl-localematcher": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz",
+      "integrity": "sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@formatjs/intl-enumerator": {
       "version": "1.3.0",
       "license": "MIT",
@@ -5377,6 +5228,110 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
       "dev": true
     },
+    "node_modules/@kie/act-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@kie/act-js/-/act-js-2.3.0.tgz",
+      "integrity": "sha512-Q9k0b05uA46jXKWmVfoGDW+0xsCcE7QPiHi8IH7h41P36DujHKBj4k28RCeIEx3IwUCxYHKwubN8DH4Vzc9XcA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@kie/mock-github": "^2.0.0",
+        "adm-zip": "^0.5.10",
+        "ajv": "^8.12.0",
+        "bin-links": "^4.0.1",
+        "express": "^4.18.1",
+        "follow-redirects": "^1.15.2",
+        "tar": "^6.1.13",
+        "yaml": "^2.1.3"
+      },
+      "bin": {
+        "act-js": "bin/act"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/@kie/mock-github": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-2.0.0.tgz",
+      "integrity": "sha512-od6UyICJYKMnz9HgEWCQAFT/JsCpKkLp+JQH8fV23tf+ZmmQI1dK3C20k6aO5uJhAHA0yOcFtbKFVF4+8i3DTg==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types-ghec": "^18.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/@octokit/openapi-types-ghec": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-18.0.0.tgz",
+      "integrity": "sha512-xY5FTR/DW2gUJdC5GyzkqrfMHhr3u3hg+dUG6bA5FvuuODw6A7+0JTTSS1ndLQEKGmFxP7chf1BKkhvhnqxCew==",
+      "dev": true
+    },
+    "node_modules/@kie/act-js/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@kie/mock-github": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-1.1.0.tgz",
+      "integrity": "sha512-fD+utlOiyZSOutOcXL0G9jfjbtvOO44PLUyTfgfkrm1+575R/dbvU6AcJfjc1DtHeRv7FC7f4ebyU+a1wgL6CA==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types-ghec": "^14.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      }
+    },
+    "node_modules/@kie/mock-github/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@kie/mock-github/node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -5413,9 +5368,9 @@
       }
     },
     "node_modules/@malept/cross-spawn-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
-      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
+      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
       "dev": true,
       "funding": [
         {
@@ -5431,7 +5386,7 @@
         "cross-spawn": "^7.0.1"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10"
       }
     },
     "node_modules/@malept/flatpak-bundler": {
@@ -5883,6 +5838,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@octokit/openapi-types-ghec": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-14.0.0.tgz",
+      "integrity": "sha512-xhd9oEvn2aroGn+sk09Ptx/76Y7aKU0EIgHukHPCU1+rGJreO36baEEk6k8ZPblieHNM39FcykJQmtDrETm0KA==",
+      "dev": true
+    },
     "node_modules/@octokit/plugin-paginate-rest": {
       "version": "3.1.0",
       "dev": true,
@@ -7113,14 +7074,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-doctor/node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/@react-native-community/cli-hermes": {
       "version": "11.3.5",
       "resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-11.3.5.tgz",
@@ -19478,7 +19431,9 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
@@ -19562,6 +19517,15 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adm-zip": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -19573,20 +19537,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/agentkeepalive": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "dev": true,
@@ -19875,16 +19825,15 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.5.0.tgz",
-      "integrity": "sha512-f8R0aWIl5/JVipwP9QvEDIuebo191zGTco/aEdJQpMinQaIZSIS3U8kt1vZxYe7kGXZ3S0zNf6h7SMcWKRLzcQ==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "^1.2.3",
-        "@electron/osx-sign": "^1.0.4",
-        "@electron/rebuild": "^3.2.13",
-        "@electron/universal": "1.3.4",
+        "@electron/notarize": "2.1.0",
+        "@electron/osx-sign": "1.0.5",
+        "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "7zip-bin": "~5.1.1",
@@ -19914,6 +19863,35 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/app-builder-lib/node_modules/@electron/notarize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz",
+      "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/@electron/notarize/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/app-builder-lib/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -21385,6 +21363,46 @@
         "node": "*"
       }
     },
+    "node_modules/bin-links": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
+      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
+      "dev": true,
+      "dependencies": {
+        "cmd-shim": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "read-cmd-shim": "^4.0.0",
+        "write-file-atomic": "^5.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/bin-links/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/bin-links/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "devOptional": true,
@@ -22818,6 +22836,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/cmd-shim": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
+      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
       "license": "MIT",
@@ -23472,6 +23499,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cp-file": {
       "version": "7.0.0",
       "dev": true,
@@ -24601,6 +24637,8 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -24713,12 +24751,12 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.5.0.tgz",
-      "integrity": "sha512-xQHaXMALL85hQJVR2CKMmN8xibjwo2Ukjpj7aape/mAfE+w7E5RNg0nD/RVQ5uj5AHPySVFHiCGrAkjXjUPOcw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "fs-extra": "^10.1.0",
@@ -25006,9 +25044,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.4.0.tgz",
-      "integrity": "sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==",
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -25024,21 +25062,21 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.5.0.tgz",
-      "integrity": "sha512-IyF6aYq5zcTz15ZkUK/PuFs3nW/fSR68ZgC/3ac32exw4ivQI0FlZLIEkJLpfI43pUFTtnvwv9Wsm1iDSf9aPw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.5.0",
+        "dmg-builder": "24.6.4",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.3.2",
-        "simple-update-notifier": "^1.1.0",
+        "simple-update-notifier": "2.0.0",
         "yargs": "^17.6.2"
       },
       "bin": {
@@ -25343,6 +25381,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -27480,8 +27519,8 @@
     },
     "node_modules/expensify-common": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
-      "integrity": "sha512-ufptwN4Ef0JiBwvit3qN9zY8y6gFQHlMJWe+Poc0cQ0XcAuYIFSxbE0cAojMuRw7eA1to87JKKF028APIXRM/Q==",
+      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
+      "integrity": "sha512-O0KbaMljSFyoZXcxtx5B2qBL+n0md3wYOrArMVT8N0W+4wKncn+p8/vrmVlUMHe/vDloUbVmUZNdHwOZNWdx3w==",
       "license": "MIT",
       "dependencies": {
         "classnames": "2.3.1",
@@ -27563,12 +27602,6 @@
       "version": "1.13.1",
       "license": "MIT"
     },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true
-    },
     "node_modules/express": {
       "version": "4.18.1",
       "dev": true,
@@ -28263,7 +28296,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true,
       "funding": [
         {
@@ -28271,7 +28306,6 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -28470,6 +28504,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "dev": true,
@@ -29757,15 +29800,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
     "node_modules/husky": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
@@ -30803,12 +30837,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true
-    },
     "node_modules/is-map": {
       "version": "2.0.2",
       "dev": true,
@@ -34608,234 +34636,6 @@
         "url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
       }
     },
-    "node_modules/make-fetch-happen": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
-      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
-      "dev": true,
-      "dependencies": {
-        "agentkeepalive": "^4.2.1",
-        "cacache": "^17.0.0",
-        "http-cache-semantics": "^4.1.1",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^7.7.1",
-        "minipass": "^5.0.0",
-        "minipass-fetch": "^3.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^7.0.0",
-        "ssri": "^10.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-      "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "17.1.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
-      "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/fs": "^3.1.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^7.7.1",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/glob": {
-      "version": "10.3.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-      "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.0.3",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/ssri": {
-      "version": "10.0.5",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
-      "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/ssri/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "license": "BSD-3-Clause",
@@ -37641,32 +37441,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/minipass-fetch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^5.0.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "dev": true,
@@ -37689,18 +37463,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minizlib": {
       "version": "2.1.2",
       "dev": true,
@@ -37986,16 +37748,19 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+    "node_modules/nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
       "dev": true,
       "dependencies": {
-        "semver": "^7.3.5"
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 10.13"
       }
     },
     "node_modules/node-abort-controller": {
@@ -38010,15 +37775,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/node-api-version": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
-      "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.5"
-      }
-    },
     "node_modules/node-dir": {
       "version": "0.1.17",
       "license": "MIT",
@@ -38071,92 +37827,6 @@
         "node": ">= 6.13.0"
       }
     },
-    "node_modules/node-gyp": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
-      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^11.0.3",
-        "nopt": "^6.0.0",
-        "npmlog": "^6.0.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": "^12.13 || ^14.13 || >=16"
-      }
-    },
-    "node_modules/node-gyp/node_modules/are-we-there-yet": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-      "dev": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/gauge": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.3",
-        "console-control-strings": "^1.1.0",
-        "has-unicode": "^2.0.1",
-        "signal-exit": "^3.0.7",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/npmlog": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-      "dev": true,
-      "dependencies": {
-        "are-we-there-yet": "^3.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^4.0.3",
-        "set-blocking": "^2.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "license": "MIT"
@@ -38224,21 +37894,6 @@
         "url": "https://github.com/sponsors/antelle"
       }
     },
-    "node_modules/nopt": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "^1.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
     "node_modules/normalize-css-color": {
       "version": "1.0.2",
       "license": "BSD-3-Clause"
@@ -38291,6 +37946,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "license": "MIT",
@@ -39261,14 +38925,6 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/patch-package/node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "0.0.1",
       "license": "MIT"
@@ -39967,6 +39623,15 @@
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/property-information": {
       "version": "5.6.0",
       "dev": true,
@@ -40058,10 +39723,10 @@
       }
     },
     "node_modules/pusher-js": {
-      "version": "7.4.0",
-      "license": "MIT",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
+      "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
       "dependencies": {
-        "@types/node": "^14.14.31",
         "tweetnacl": "^1.0.3"
       }
     },
@@ -40073,11 +39738,6 @@
         "node": ">=4.2.4"
       }
     },
-    "node_modules/pusher-js/node_modules/@types/node": {
-      "version": "14.18.56",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.56.tgz",
-      "integrity": "sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w=="
-    },
     "node_modules/qrcode": {
       "version": "1.5.3",
       "license": "MIT",
@@ -40528,6 +40188,17 @@
         "react": "^18.1.0"
       }
     },
+    "node_modules/react-error-boundary": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.11.tgz",
+      "integrity": "sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "peerDependencies": {
+        "react": ">=16.13.1"
+      }
+    },
     "node_modules/react-freeze": {
       "version": "1.0.3",
       "license": "MIT",
@@ -40780,8 +40451,8 @@
     },
     "node_modules/react-native-google-places-autocomplete": {
       "version": "2.5.1",
-      "resolved": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
-      "integrity": "sha512-OJWCz4Epj1p8tyNImWNykAqpd/X1MkNCFPY0dSbgiTJGbW4J5T4bC0PIUQ+ExjxWpWjcFaielTLdoSz0HfeIpw==",
+      "resolved": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#fd212e1e93cad72e97efad03893bea6d074d3e07",
+      "integrity": "sha512-tuU9AIvDtbGe+zEIdFXEuoMQl3n+JHWvMpTpMDdih1evgMiiX4tZxnHmMPpvhrxs9DiPaT/1+92eqJtMI3s+fA==",
       "license": "MIT",
       "dependencies": {
         "lodash.debounce": "^4.0.8",
@@ -40885,9 +40556,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.70.tgz",
-      "integrity": "sha512-bc/u4kkcwbrN6kLxXprZbwYqApYJ7G07IKteJhRuIjXi1hMPxOznRxxqMaOTELgET9y5LezUOB2QOwfEZ59FLg==",
+      "version": "1.0.77",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.77.tgz",
+      "integrity": "sha512-HmeS1Pz/BkKNbYuhWULC9I0VRBDt8yadG0ZFIW6wuZ+VajhjD960qh7Il1+XzEBI6Vb4d7BZkPcad87ad1IEOQ==",
       "dependencies": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -40901,7 +40572,7 @@
         "idb-keyval": "^6.2.1",
         "react": ">=18.1.0",
         "react-native-device-info": "^10.3.0",
-        "react-native-performance": "^4.0.0",
+        "react-native-performance": "^5.1.0",
         "react-native-quick-sqlite": "^8.0.0-beta.2"
       },
       "peerDependenciesMeta": {
@@ -40943,8 +40614,9 @@
       }
     },
     "node_modules/react-native-performance": {
-      "version": "4.0.0",
-      "license": "MIT",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-performance/-/react-native-performance-5.1.0.tgz",
+      "integrity": "sha512-rq/YBf0/GptSOM/Lj64/1yRq8uN2YE0psFB16wFbYBbTcIEp/0rrgN2HyS5lhvfBOFgKoDRWQ53jHSCb+QJ5eA==",
       "peerDependencies": {
         "react-native": "*"
       }
@@ -41101,8 +40773,9 @@
       }
     },
     "node_modules/react-native-svg": {
-      "version": "13.9.0",
-      "license": "MIT",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.13.0.tgz",
+      "integrity": "sha512-L8y8uEiMG0Tr++Nb2+24wlMuv18+bmq/CMoFFtTUlEqVvGCoK2ea8WamPl/9bV8gjL+Rngg5NqEBvKS23sbYoA==",
       "dependencies": {
         "css-select": "^5.1.0",
         "css-tree": "^1.1.3"
@@ -41222,18 +40895,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/react-native-x-maps": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.10.tgz",
-      "integrity": "sha512-jBRl5JzP3QmGY6tj5CR9UwbREZ3tnuSa7puZozai3bRFrN68k3W6x1p6O8SGp91VvcQlaqJUPFZ+bkYiY3XRvA==",
-      "peerDependencies": {
-        "@rnmapbox/maps": "^10.0.11",
-        "mapbox-gl": "^2.15.0",
-        "react": "^18.2.0",
-        "react-map-gl": "^7.1.3",
-        "react-native": "^0.72.3"
-      }
-    },
     "node_modules/react-native/node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -41989,6 +41650,15 @@
         "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/read-cmd-shim": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
+      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/read-config-file": {
       "version": "6.3.2",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
@@ -43793,24 +43463,15 @@
       "license": "MIT"
     },
     "node_modules/simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
       "dependencies": {
-        "semver": "~7.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/simple-update-notifier/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/simply-deferred": {
@@ -43901,6 +43562,7 @@
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -44130,34 +43792,6 @@
         "websocket-driver": "^0.7.4"
       }
     },
-    "node_modules/socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-      "dev": true,
-      "dependencies": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/sort-asc": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
@@ -48319,11 +47953,11 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "dev": true,
-      "license": "ISC",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
@@ -50316,9 +49950,9 @@
       }
     },
     "@electron/osx-sign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.4.tgz",
-      "integrity": "sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
+      "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
       "dev": true,
       "requires": {
         "compare-version": "^0.1.2",
@@ -50348,131 +49982,10 @@
         }
       }
     },
-    "@electron/rebuild": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.2.13.tgz",
-      "integrity": "sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g==",
-      "dev": true,
-      "requires": {
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "chalk": "^4.0.0",
-        "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.7.0",
-        "node-abi": "^3.0.0",
-        "node-api-version": "^0.1.4",
-        "node-gyp": "^9.0.0",
-        "ora": "^5.1.0",
-        "semver": "^7.3.5",
-        "tar": "^6.0.5",
-        "yargs": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cliui": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "17.7.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.1.1"
-          }
-        },
-        "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
-        }
-      }
-    },
     "@electron/universal": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz",
-      "integrity": "sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz",
+      "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==",
       "dev": true,
       "requires": {
         "@electron/asar": "^3.2.1",
@@ -50482,17 +49995,6 @@
         "fs-extra": "^9.0.1",
         "minimatch": "^3.0.4",
         "plist": "^3.0.4"
-      },
-      "dependencies": {
-        "@malept/cross-spawn-promise": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-          "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.1"
-          }
-        }
       }
     },
     "@emotion/use-insertion-effect-with-fallbacks": {
@@ -50884,6 +50386,35 @@
         "tslib": "^2.4.0"
       }
     },
+    "@formatjs/intl-datetimeformat": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.10.0.tgz",
+      "integrity": "sha512-5tJWZxOyP5D4PDrqv27h0LWAPHhQM9BHR0pDBTZOKWFEZNrS2IgREbyalSGwQLtN1tZaDrt3YeNfNLbZk1wSUw==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.17.0",
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz",
+          "integrity": "sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==",
+          "requires": {
+            "@formatjs/intl-localematcher": "0.4.0",
+            "tslib": "^2.4.0"
+          }
+        },
+        "@formatjs/intl-localematcher": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz",
+          "integrity": "sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==",
+          "requires": {
+            "tslib": "^2.4.0"
+          }
+        }
+      }
+    },
     "@formatjs/intl-enumerator": {
       "version": "1.3.0",
       "requires": {
@@ -51960,6 +51491,98 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
       "dev": true
     },
+    "@kie/act-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@kie/act-js/-/act-js-2.3.0.tgz",
+      "integrity": "sha512-Q9k0b05uA46jXKWmVfoGDW+0xsCcE7QPiHi8IH7h41P36DujHKBj4k28RCeIEx3IwUCxYHKwubN8DH4Vzc9XcA==",
+      "dev": true,
+      "requires": {
+        "@kie/mock-github": "^2.0.0",
+        "adm-zip": "^0.5.10",
+        "ajv": "^8.12.0",
+        "bin-links": "^4.0.1",
+        "express": "^4.18.1",
+        "follow-redirects": "^1.15.2",
+        "tar": "^6.1.13",
+        "yaml": "^2.1.3"
+      },
+      "dependencies": {
+        "@kie/mock-github": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-2.0.0.tgz",
+          "integrity": "sha512-od6UyICJYKMnz9HgEWCQAFT/JsCpKkLp+JQH8fV23tf+ZmmQI1dK3C20k6aO5uJhAHA0yOcFtbKFVF4+8i3DTg==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types-ghec": "^18.0.0",
+            "ajv": "^8.11.0",
+            "express": "^4.18.1",
+            "fast-glob": "^3.2.12",
+            "fs-extra": "^10.1.0",
+            "nock": "^13.2.7",
+            "simple-git": "^3.8.0",
+            "totalist": "^3.0.0"
+          }
+        },
+        "@octokit/openapi-types-ghec": {
+          "version": "18.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-18.0.0.tgz",
+          "integrity": "sha512-xY5FTR/DW2gUJdC5GyzkqrfMHhr3u3hg+dUG6bA5FvuuODw6A7+0JTTSS1ndLQEKGmFxP7chf1BKkhvhnqxCew==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "totalist": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+          "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+          "dev": true
+        }
+      }
+    },
+    "@kie/mock-github": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-1.1.0.tgz",
+      "integrity": "sha512-fD+utlOiyZSOutOcXL0G9jfjbtvOO44PLUyTfgfkrm1+575R/dbvU6AcJfjc1DtHeRv7FC7f4ebyU+a1wgL6CA==",
+      "dev": true,
+      "requires": {
+        "@octokit/openapi-types-ghec": "^14.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "totalist": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+          "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+          "dev": true
+        }
+      }
+    },
     "@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -51987,9 +51610,9 @@
       }
     },
     "@malept/cross-spawn-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
-      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
+      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
       "dev": true,
       "requires": {
         "cross-spawn": "^7.0.1"
@@ -52342,6 +51965,12 @@
       "version": "12.11.0",
       "dev": true
     },
+    "@octokit/openapi-types-ghec": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-14.0.0.tgz",
+      "integrity": "sha512-xhd9oEvn2aroGn+sk09Ptx/76Y7aKU0EIgHukHPCU1+rGJreO36baEEk6k8ZPblieHNM39FcykJQmtDrETm0KA==",
+      "dev": true
+    },
     "@octokit/plugin-paginate-rest": {
       "version": "3.1.0",
       "dev": true,
@@ -53255,11 +52884,6 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "yaml": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-          "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
         }
       }
     },
@@ -61912,7 +61536,9 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "abort-controller": {
       "version": "3.0.0",
@@ -61963,6 +61589,12 @@
       "version": "1.2.1",
       "dev": true
     },
+    "adm-zip": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "dev": true
+    },
     "agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -61970,17 +61602,6 @@
         "debug": "4"
       }
     },
-    "agentkeepalive": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
-        "humanize-ms": "^1.2.1"
-      }
-    },
     "aggregate-error": {
       "version": "3.1.0",
       "dev": true,
@@ -62174,16 +61795,15 @@
       "dev": true
     },
     "app-builder-lib": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.5.0.tgz",
-      "integrity": "sha512-f8R0aWIl5/JVipwP9QvEDIuebo191zGTco/aEdJQpMinQaIZSIS3U8kt1vZxYe7kGXZ3S0zNf6h7SMcWKRLzcQ==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
       "dev": true,
       "requires": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "^1.2.3",
-        "@electron/osx-sign": "^1.0.4",
-        "@electron/rebuild": "^3.2.13",
-        "@electron/universal": "1.3.4",
+        "@electron/notarize": "2.1.0",
+        "@electron/osx-sign": "1.0.5",
+        "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "7zip-bin": "~5.1.1",
@@ -62210,6 +61830,31 @@
         "temp-file": "^3.4.0"
       },
       "dependencies": {
+        "@electron/notarize": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz",
+          "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.1",
+            "fs-extra": "^9.0.1",
+            "promise-retry": "^2.0.1"
+          },
+          "dependencies": {
+            "fs-extra": {
+              "version": "9.1.0",
+              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+              "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+              "dev": true,
+              "requires": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+              }
+            }
+          }
+        },
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -63249,6 +62894,36 @@
       "version": "5.2.2",
       "devOptional": true
     },
+    "bin-links": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
+      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
+      "dev": true,
+      "requires": {
+        "cmd-shim": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "read-cmd-shim": "^4.0.0",
+        "write-file-atomic": "^5.0.0"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        },
+        "write-file-atomic": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+          "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+          "dev": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^4.0.1"
+          }
+        }
+      }
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "devOptional": true
@@ -64224,6 +63899,12 @@
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
       "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
     },
+    "cmd-shim": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
+      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
+      "dev": true
+    },
     "co": {
       "version": "4.6.0"
     },
@@ -64658,6 +64339,14 @@
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
         "yaml": "^1.10.0"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
       }
     },
     "cp-file": {
@@ -65430,7 +65119,9 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "detect-newline": {
       "version": "3.1.0"
@@ -65511,12 +65202,12 @@
       }
     },
     "dmg-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.5.0.tgz",
-      "integrity": "sha512-xQHaXMALL85hQJVR2CKMmN8xibjwo2Ukjpj7aape/mAfE+w7E5RNg0nD/RVQ5uj5AHPySVFHiCGrAkjXjUPOcw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "dmg-license": "^1.0.11",
@@ -65728,9 +65419,9 @@
       }
     },
     "electron": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.4.0.tgz",
-      "integrity": "sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==",
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^2.0.0",
@@ -65739,21 +65430,21 @@
       }
     },
     "electron-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.5.0.tgz",
-      "integrity": "sha512-IyF6aYq5zcTz15ZkUK/PuFs3nW/fSR68ZgC/3ac32exw4ivQI0FlZLIEkJLpfI43pUFTtnvwv9Wsm1iDSf9aPw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.5.0",
+        "dmg-builder": "24.6.4",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.3.2",
-        "simple-update-notifier": "^1.1.0",
+        "simple-update-notifier": "2.0.0",
         "yargs": "^17.6.2"
       },
       "dependencies": {
@@ -65970,6 +65661,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "optional": true,
+      "peer": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       }
@@ -67451,9 +67143,9 @@
       }
     },
     "expensify-common": {
-      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
-      "integrity": "sha512-ufptwN4Ef0JiBwvit3qN9zY8y6gFQHlMJWe+Poc0cQ0XcAuYIFSxbE0cAojMuRw7eA1to87JKKF028APIXRM/Q==",
-      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
+      "integrity": "sha512-O0KbaMljSFyoZXcxtx5B2qBL+n0md3wYOrArMVT8N0W+4wKncn+p8/vrmVlUMHe/vDloUbVmUZNdHwOZNWdx3w==",
+      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
       "requires": {
         "classnames": "2.3.1",
         "clipboard": "2.0.4",
@@ -67511,12 +67203,6 @@
         }
       }
     },
-    "exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true
-    },
     "express": {
       "version": "4.18.1",
       "dev": true,
@@ -68009,7 +67695,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true
     },
     "for-each": {
@@ -68125,6 +67813,12 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
         }
       }
     },
@@ -68986,15 +68680,6 @@
     "human-signals": {
       "version": "2.1.0"
     },
-    "humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.0.0"
-      }
-    },
     "husky": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
@@ -69651,12 +69336,6 @@
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
     },
-    "is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true
-    },
     "is-map": {
       "version": "2.0.2",
       "dev": true
@@ -72236,179 +71915,6 @@
       "resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.6.1.tgz",
       "integrity": "sha512-JhvWq/iz1BvlmnPvLJjXv+xnMPJZuychrDC68V+yCGQJn5chcA8rLGKo5EP1XwIKVrigSXKLmbeXAGkf36wdCQ=="
     },
-    "make-fetch-happen": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
-      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
-      "dev": true,
-      "requires": {
-        "agentkeepalive": "^4.2.1",
-        "cacache": "^17.0.0",
-        "http-cache-semantics": "^4.1.1",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^7.7.1",
-        "minipass": "^5.0.0",
-        "minipass-fetch": "^3.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^7.0.0",
-        "ssri": "^10.0.0"
-      },
-      "dependencies": {
-        "@npmcli/fs": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-          "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-          "dev": true,
-          "requires": {
-            "semver": "^7.3.5"
-          }
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "cacache": {
-          "version": "17.1.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
-          "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
-          "dev": true,
-          "requires": {
-            "@npmcli/fs": "^3.1.0",
-            "fs-minipass": "^3.0.0",
-            "glob": "^10.2.2",
-            "lru-cache": "^7.7.1",
-            "minipass": "^7.0.3",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "p-map": "^4.0.0",
-            "ssri": "^10.0.0",
-            "tar": "^6.1.11",
-            "unique-filename": "^3.0.0"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "foreground-child": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-          "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "signal-exit": "^4.0.1"
-          }
-        },
-        "fs-minipass": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-          "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-          "dev": true,
-          "requires": {
-            "minipass": "^7.0.3"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "glob": {
-          "version": "10.3.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-          "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-          "dev": true,
-          "requires": {
-            "foreground-child": "^3.1.0",
-            "jackspeak": "^2.0.3",
-            "minimatch": "^9.0.1",
-            "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-            "path-scurry": "^1.10.1"
-          }
-        },
-        "lru-cache": {
-          "version": "7.18.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "9.0.3",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
-        "minipass": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-          "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-          "dev": true
-        },
-        "signal-exit": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "10.0.5",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
-          "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
-          "dev": true,
-          "requires": {
-            "minipass": "^7.0.3"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "unique-filename": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-          "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-          "dev": true,
-          "requires": {
-            "unique-slug": "^4.0.0"
-          }
-        },
-        "unique-slug": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-          "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-          "dev": true,
-          "requires": {
-            "imurmurhash": "^0.1.4"
-          }
-        }
-      }
-    },
     "makeerror": {
       "version": "1.0.12",
       "requires": {
@@ -74416,26 +73922,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-fetch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.13",
-        "minipass": "^5.0.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-          "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-          "dev": true
-        }
-      }
-    },
     "minipass-flush": {
       "version": "1.0.5",
       "dev": true,
@@ -74450,15 +73936,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "minizlib": {
       "version": "2.1.2",
       "dev": true,
@@ -74658,13 +74135,16 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz",
       "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="
     },
-    "node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+    "nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
       "dev": true,
       "requires": {
-        "semver": "^7.3.5"
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
       }
     },
     "node-abort-controller": {
@@ -74679,15 +74159,6 @@
       "dev": true,
       "optional": true
     },
-    "node-api-version": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
-      "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==",
-      "dev": true,
-      "requires": {
-        "semver": "^7.3.5"
-      }
-    },
     "node-dir": {
       "version": "0.1.17",
       "requires": {
@@ -74719,76 +74190,6 @@
       "version": "1.3.1",
       "dev": true
     },
-    "node-gyp": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
-      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
-      "dev": true,
-      "requires": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^11.0.3",
-        "nopt": "^6.0.0",
-        "npmlog": "^6.0.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "are-we-there-yet": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-          "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-          "dev": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "gauge": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-          "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-          "dev": true,
-          "requires": {
-            "aproba": "^1.0.3 || ^2.0.0",
-            "color-support": "^1.1.3",
-            "console-control-strings": "^1.1.0",
-            "has-unicode": "^2.0.1",
-            "signal-exit": "^3.0.7",
-            "string-width": "^4.2.3",
-            "strip-ansi": "^6.0.1",
-            "wide-align": "^1.1.5"
-          }
-        },
-        "npmlog": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-          "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-          "dev": true,
-          "requires": {
-            "are-we-there-yet": "^3.0.0",
-            "console-control-strings": "^1.1.0",
-            "gauge": "^4.0.3",
-            "set-blocking": "^2.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "node-int64": {
       "version": "0.4.0"
     },
@@ -74846,15 +74247,6 @@
       "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
       "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw=="
     },
-    "nopt": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-      "dev": true,
-      "requires": {
-        "abbrev": "^1.0.0"
-      }
-    },
     "normalize-css-color": {
       "version": "1.0.2"
     },
@@ -74888,6 +74280,12 @@
       "version": "6.1.0",
       "dev": true
     },
+    "npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true
+    },
     "npm-run-path": {
       "version": "4.0.1",
       "requires": {
@@ -75519,11 +74917,6 @@
           "requires": {
             "os-tmpdir": "~1.0.2"
           }
-        },
-        "yaml": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-          "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
         }
       }
     },
@@ -75988,6 +75381,12 @@
         "react-is": "^16.13.1"
       }
     },
+    "propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true
+    },
     "property-information": {
       "version": "5.6.0",
       "dev": true,
@@ -76064,17 +75463,11 @@
       "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
     },
     "pusher-js": {
-      "version": "7.4.0",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
+      "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
       "requires": {
-        "@types/node": "^14.14.31",
         "tweetnacl": "^1.0.3"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "14.18.56",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.56.tgz",
-          "integrity": "sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w=="
-        }
       }
     },
     "pusher-js-mock": {
@@ -76361,6 +75754,14 @@
         "scheduler": "^0.22.0"
       }
     },
+    "react-error-boundary": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.11.tgz",
+      "integrity": "sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==",
+      "requires": {
+        "@babel/runtime": "^7.12.5"
+      }
+    },
     "react-freeze": {
       "version": "1.0.3",
       "requires": {}
@@ -76636,9 +76037,9 @@
       }
     },
     "react-native-google-places-autocomplete": {
-      "version": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
-      "integrity": "sha512-OJWCz4Epj1p8tyNImWNykAqpd/X1MkNCFPY0dSbgiTJGbW4J5T4bC0PIUQ+ExjxWpWjcFaielTLdoSz0HfeIpw==",
-      "from": "react-native-google-places-autocomplete@git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+      "version": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#fd212e1e93cad72e97efad03893bea6d074d3e07",
+      "integrity": "sha512-tuU9AIvDtbGe+zEIdFXEuoMQl3n+JHWvMpTpMDdih1evgMiiX4tZxnHmMPpvhrxs9DiPaT/1+92eqJtMI3s+fA==",
+      "from": "react-native-google-places-autocomplete@git+https://github.com/Expensify/react-native-google-places-autocomplete.git#fd212e1e93cad72e97efad03893bea6d074d3e07",
       "requires": {
         "lodash.debounce": "^4.0.8",
         "prop-types": "^15.7.2",
@@ -76692,9 +76093,9 @@
       }
     },
     "react-native-onyx": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.70.tgz",
-      "integrity": "sha512-bc/u4kkcwbrN6kLxXprZbwYqApYJ7G07IKteJhRuIjXi1hMPxOznRxxqMaOTELgET9y5LezUOB2QOwfEZ59FLg==",
+      "version": "1.0.77",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.77.tgz",
+      "integrity": "sha512-HmeS1Pz/BkKNbYuhWULC9I0VRBDt8yadG0ZFIW6wuZ+VajhjD960qh7Il1+XzEBI6Vb4d7BZkPcad87ad1IEOQ==",
       "requires": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -76717,7 +76118,9 @@
       }
     },
     "react-native-performance": {
-      "version": "4.0.0",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-performance/-/react-native-performance-5.1.0.tgz",
+      "integrity": "sha512-rq/YBf0/GptSOM/Lj64/1yRq8uN2YE0psFB16wFbYBbTcIEp/0rrgN2HyS5lhvfBOFgKoDRWQ53jHSCb+QJ5eA==",
       "requires": {}
     },
     "react-native-performance-flipper-reporter": {
@@ -76814,7 +76217,9 @@
       }
     },
     "react-native-svg": {
-      "version": "13.9.0",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.13.0.tgz",
+      "integrity": "sha512-L8y8uEiMG0Tr++Nb2+24wlMuv18+bmq/CMoFFtTUlEqVvGCoK2ea8WamPl/9bV8gjL+Rngg5NqEBvKS23sbYoA==",
       "requires": {
         "css-select": "^5.1.0",
         "css-tree": "^1.1.3"
@@ -76892,12 +76297,6 @@
         }
       }
     },
-    "react-native-x-maps": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.10.tgz",
-      "integrity": "sha512-jBRl5JzP3QmGY6tj5CR9UwbREZ3tnuSa7puZozai3bRFrN68k3W6x1p6O8SGp91VvcQlaqJUPFZ+bkYiY3XRvA==",
-      "requires": {}
-    },
     "react-pdf": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-6.2.2.tgz",
@@ -77284,6 +76683,12 @@
         "memoize-one": ">=3.1.1 <6"
       }
     },
+    "read-cmd-shim": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
+      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
+      "dev": true
+    },
     "read-config-file": {
       "version": "6.3.2",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
@@ -78566,20 +77971,12 @@
       }
     },
     "simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
       "requires": {
-        "semver": "~7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
+        "semver": "^7.5.3"
       }
     },
     "simply-deferred": {
@@ -78647,7 +78044,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -78810,27 +78208,6 @@
         "websocket-driver": "^0.7.4"
       }
     },
-    "socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-      "dev": true,
-      "requires": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-      "dev": true,
-      "requires": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      }
-    },
     "sort-asc": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
@@ -81642,8 +81019,9 @@
       "version": "4.0.0"
     },
     "yaml": {
-      "version": "1.10.2",
-      "dev": true
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg=="
     },
     "yargs": {
       "version": "13.3.2",
diff --git a/package.json b/package.json
index e9358de7fd28..1b819ef74965 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.60-1",
+  "version": "1.3.71-7",
   "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.",
@@ -11,10 +11,10 @@
     "postinstall": "scripts/postInstall.sh",
     "clean": "npx react-native clean-project-auto",
     "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --variant=developmentDebug --appId=com.expensify.chat.dev",
-    "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --configuration=\"Debug Development\" --scheme=\"New Expensify Dev\"",
+    "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --configuration=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
     "pod-install": "cd ios && bundle exec pod install",
-    "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
-    "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
+    "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
+    "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"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": "node web/proxy.js",
@@ -47,10 +47,13 @@
     "analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
-    "test:e2e": "node tests/e2e/testRunner.js --development"
+    "test:e2e": "node tests/e2e/testRunner.js --development",
+    "workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
+    "workflow-test:generate": "node workflow_tests/utils/preGenerateTest.js"
   },
   "dependencies": {
     "@expensify/react-native-web": "0.18.15",
+    "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-getcanonicallocales": "^2.2.0",
     "@formatjs/intl-listformat": "^7.2.2",
     "@formatjs/intl-locale": "^3.3.0",
@@ -59,6 +62,8 @@
     "@gorhom/portal": "^1.0.14",
     "@invertase/react-native-apple-authentication": "^2.2.2",
     "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52",
+    "@kie/act-js": "^2.0.1",
+    "@kie/mock-github": "^1.0.0",
     "@onfido/react-native-sdk": "7.4.0",
     "@react-native-async-storage/async-storage": "^1.17.10",
     "@react-native-camera-roll/camera-roll": "5.4.0",
@@ -78,6 +83,7 @@
     "@rnmapbox/maps": "^10.0.11",
     "@ua/react-native-airship": "^15.2.6",
     "awesome-phonenumber": "^5.4.0",
+    "@types/node": "^18.14.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
     "canvas-size": "^1.2.6",
@@ -86,7 +92,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#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
     "fbjs": "^3.0.2",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
@@ -100,12 +106,13 @@
     "patch-package": "^8.0.0",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "pusher-js": "7.4.0",
+    "pusher-js": "8.3.0",
     "react": "18.2.0",
     "react-collapse": "^5.1.0",
     "react-content-loader": "^6.1.0",
     "react-dom": "18.1.0",
     "react-map-gl": "^7.1.3",
+    "react-error-boundary": "^4.0.11",
     "react-native": "0.72.3",
     "react-native-blob-util": "^0.17.3",
     "react-native-collapsible": "^1.6.0",
@@ -116,7 +123,7 @@
     "react-native-fast-image": "^8.6.3",
     "react-native-fs": "^2.20.0",
     "react-native-gesture-handler": "2.12.0",
-    "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+    "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#fd212e1e93cad72e97efad03893bea6d074d3e07",
     "react-native-haptic-feedback": "^1.13.0",
     "react-native-image-pan-zoom": "^2.1.12",
     "react-native-image-picker": "^5.1.0",
@@ -125,10 +132,10 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.70",
+    "react-native-onyx": "1.0.77",
     "react-native-pager-view": "^6.2.0",
     "react-native-pdf": "^6.7.1",
-    "react-native-performance": "^4.0.0",
+    "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.0.1",
     "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
     "react-native-plaid-link-sdk": "^10.0.0",
@@ -138,7 +145,7 @@
     "react-native-render-html": "6.3.1",
     "react-native-safe-area-context": "4.4.1",
     "react-native-screens": "3.21.0",
-    "react-native-svg": "^13.9.0",
+    "react-native-svg": "^13.13.0",
     "react-native-tab-view": "^3.5.2",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "^3.6.0",
@@ -146,7 +153,6 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-lottie": "^1.4.4",
     "react-native-webview": "^11.17.2",
-    "react-native-x-maps": "1.0.10",
     "react-pdf": "^6.2.2",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
@@ -169,6 +175,8 @@
     "@babel/runtime": "^7.20.0",
     "@electron/notarize": "^1.2.3",
     "@jest/globals": "^29.5.0",
+    "@kie/act-js": "^2.0.1",
+    "@kie/mock-github": "^1.0.0",
     "@octokit/core": "4.0.4",
     "@octokit/plugin-paginate-rest": "3.1.0",
     "@octokit/plugin-throttling": "4.1.0",
@@ -220,8 +228,8 @@
     "css-loader": "^6.7.2",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "^25.4.0",
-    "electron-builder": "24.5.0",
+    "electron": "^25.8.1",
+    "electron-builder": "24.6.4",
     "eslint": "^7.6.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-config-expensify": "^2.0.38",
@@ -262,7 +270,8 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.3",
     "webpack-font-preload-plugin": "^1.5.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "yaml": "^2.2.1"
   },
   "overrides": {
     "react-native": "$react-native"
diff --git a/patches/@react-navigation+material-top-tabs+6.6.3.patch b/patches/@react-navigation+material-top-tabs+6.6.3.patch
new file mode 100644
index 000000000000..cce3b67b2e64
--- /dev/null
+++ b/patches/@react-navigation+material-top-tabs+6.6.3.patch
@@ -0,0 +1,146 @@
+diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/index.js b/node_modules/@react-navigation/material-top-tabs/lib/module/index.js
+index b83d44f..9d158a0 100644
+--- a/node_modules/@react-navigation/material-top-tabs/lib/module/index.js
++++ b/node_modules/@react-navigation/material-top-tabs/lib/module/index.js
+@@ -9,6 +9,11 @@ export { default as createMaterialTopTabNavigator } from './navigators/createMat
+ export { default as MaterialTopTabBar } from './views/MaterialTopTabBar';
+ export { default as MaterialTopTabView } from './views/MaterialTopTabView';
+ 
++/**
++ * Utilities
++ */
++export { useTabAnimation } from './utils/useTabAnimation';
++
+ /**
+  * Types
+  */
+diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/utils/TabAnimationContext.js b/node_modules/@react-navigation/material-top-tabs/lib/module/utils/TabAnimationContext.js
+new file mode 100644
+index 0000000..4ef4e76
+--- /dev/null
++++ b/node_modules/@react-navigation/material-top-tabs/lib/module/utils/TabAnimationContext.js
+@@ -0,0 +1,3 @@
++import * as React from 'react';
++export const TabAnimationContext = /*#__PURE__*/React.createContext(undefined);
++//# sourceMappingURL=TabAnimationContext.js.map
+\ No newline at end of file
+diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/utils/useTabAnimation.js b/node_modules/@react-navigation/material-top-tabs/lib/module/utils/useTabAnimation.js
+new file mode 100644
+index 0000000..764ca9b
+--- /dev/null
++++ b/node_modules/@react-navigation/material-top-tabs/lib/module/utils/useTabAnimation.js
+@@ -0,0 +1,10 @@
++import * as React from 'react';
++import { TabAnimationContext } from './TabAnimationContext';
++export function useTabAnimation() {
++  const animation = React.useContext(TabAnimationContext);
++  if (animation === undefined) {
++    throw new Error("Couldn't find values for card animation. Are you inside a screen in Tab?");
++  }
++  return animation;
++}
++//# sourceMappingURL=useTabAnimation.js.map
+\ No newline at end of file
+diff --git a/node_modules/@react-navigation/material-top-tabs/lib/module/views/MaterialTopTabView.js b/node_modules/@react-navigation/material-top-tabs/lib/module/views/MaterialTopTabView.js
+index 7eda7c4..f736fd9 100644
+--- a/node_modules/@react-navigation/material-top-tabs/lib/module/views/MaterialTopTabView.js
++++ b/node_modules/@react-navigation/material-top-tabs/lib/module/views/MaterialTopTabView.js
+@@ -2,6 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
+ import { CommonActions, useTheme } from '@react-navigation/native';
+ import * as React from 'react';
+ import { TabView } from 'react-native-tab-view';
++import { TabAnimationContext } from '../utils/TabAnimationContext';
+ import MaterialTopTabBar from './MaterialTopTabBar';
+ export default function MaterialTopTabView(_ref) {
+   let {
+@@ -34,9 +35,12 @@ export default function MaterialTopTabView(_ref) {
+     }),
+     renderScene: _ref2 => {
+       let {
+-        route
++        route,
++        position
+       } = _ref2;
+-      return descriptors[route.key].render();
++      return /*#__PURE__*/React.createElement(TabAnimationContext.Provider, {
++        value: position
++      }, descriptors[route.key].render());
+     },
+     navigationState: state,
+     renderTabBar: renderTabBar,
+diff --git a/node_modules/@react-navigation/material-top-tabs/src/index.tsx b/node_modules/@react-navigation/material-top-tabs/src/index.tsx
+index ae02811..b735f30 100644
+--- a/node_modules/@react-navigation/material-top-tabs/src/index.tsx
++++ b/node_modules/@react-navigation/material-top-tabs/src/index.tsx
+@@ -9,6 +9,11 @@ export { default as createMaterialTopTabNavigator } from './navigators/createMat
+ export { default as MaterialTopTabBar } from './views/MaterialTopTabBar';
+ export { default as MaterialTopTabView } from './views/MaterialTopTabView';
+ 
++/**
++ * Utilities
++ */
++export { useTabAnimation } from './utils/useTabAnimation';
++
+ /**
+  * Types
+  */
+diff --git a/node_modules/@react-navigation/material-top-tabs/src/utils/TabAnimationContext.ts b/node_modules/@react-navigation/material-top-tabs/src/utils/TabAnimationContext.ts
+new file mode 100644
+index 0000000..92a97ec
+--- /dev/null
++++ b/node_modules/@react-navigation/material-top-tabs/src/utils/TabAnimationContext.ts
+@@ -0,0 +1,6 @@
++import * as React from 'react';
++import type { Animated } from 'react-native';
++
++export const TabAnimationContext = React.createContext<
++  Animated.AnimatedInterpolation<number> | undefined
++>(undefined);
+\ No newline at end of file
+diff --git a/node_modules/@react-navigation/material-top-tabs/src/utils/useTabAnimation.ts b/node_modules/@react-navigation/material-top-tabs/src/utils/useTabAnimation.ts
+new file mode 100644
+index 0000000..6c122a7
+--- /dev/null
++++ b/node_modules/@react-navigation/material-top-tabs/src/utils/useTabAnimation.ts
+@@ -0,0 +1,15 @@
++import * as React from 'react';
++
++import { TabAnimationContext } from './TabAnimationContext';
++
++export function useTabAnimation() {
++  const animation = React.useContext(TabAnimationContext);
++
++  if (animation === undefined) {
++    throw new Error(
++      "Couldn't find values for card animation. Are you inside a screen in Tab?"
++    );
++  }
++
++  return animation;
++}
+\ No newline at end of file
+diff --git a/node_modules/@react-navigation/material-top-tabs/src/views/MaterialTopTabView.tsx b/node_modules/@react-navigation/material-top-tabs/src/views/MaterialTopTabView.tsx
+index 1282698..9b0af5d 100644
+--- a/node_modules/@react-navigation/material-top-tabs/src/views/MaterialTopTabView.tsx
++++ b/node_modules/@react-navigation/material-top-tabs/src/views/MaterialTopTabView.tsx
+@@ -14,6 +14,7 @@ import type {
+   MaterialTopTabNavigationConfig,
+   MaterialTopTabNavigationHelpers,
+ } from '../types';
++import { TabAnimationContext } from '../utils/TabAnimationContext';
+ import MaterialTopTabBar from './MaterialTopTabBar';
+ 
+ type Props = MaterialTopTabNavigationConfig & {
+@@ -55,7 +56,11 @@ export default function MaterialTopTabView({
+           target: state.key,
+         })
+       }
+-      renderScene={({ route }) => descriptors[route.key].render()}
++      renderScene={({ route, position }) => (
++        <TabAnimationContext.Provider value={position}>
++          {descriptors[route.key].render()}
++        </TabAnimationContext.Provider>
++      )}
+       navigationState={state}
+       renderTabBar={renderTabBar}
+       renderLazyPlaceholder={({ route }) =>
diff --git a/patches/@react-navigation+native+6.1.6.patch b/patches/@react-navigation+native+6.1.6.patch
index 61e5eb9892e1..eb933683c850 100644
--- a/patches/@react-navigation+native+6.1.6.patch
+++ b/patches/@react-navigation+native+6.1.6.patch
@@ -133,7 +133,7 @@ index 0000000..16da117
 +//# sourceMappingURL=findFocusedRouteKey.js.map
 \ No newline at end of file
 diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 5bf2a88..a6d0670 100644
+index 5bf2a88..a4318ef 100644
 --- a/node_modules/@react-navigation/native/lib/module/useLinking.js
 +++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
 @@ -2,6 +2,7 @@ import { findFocusedRoute, getActionFromState as getActionFromStateDefault, getP
@@ -144,7 +144,37 @@ index 5bf2a88..a6d0670 100644
  import ServerContext from './ServerContext';
  /**
   * Find the matching navigation state that changed between 2 navigation states
-@@ -60,6 +61,44 @@ const series = cb => {
+@@ -34,32 +35,52 @@ const findMatchingState = (a, b) => {
+ /**
+  * Run async function in series as it's called.
+  */
+-const series = cb => {
+-  // Whether we're currently handling a callback
+-  let handling = false;
+-  let queue = [];
+-  const callback = async () => {
+-    try {
+-      if (handling) {
+-        // If we're currently handling a previous event, wait before handling this one
+-        // Add the callback to the beginning of the queue
+-        queue.unshift(callback);
+-        return;
+-      }
+-      handling = true;
+-      await cb();
+-    } finally {
+-      handling = false;
+-      if (queue.length) {
+-        // If we have queued items, handle the last one
+-        const last = queue.pop();
+-        last === null || last === void 0 ? void 0 : last();
+-      }
+-    }
++const series = (cb) => {
++  let queue = Promise.resolve();
++  const callback = () => {
++    queue = queue.then(cb);
+   };
    return callback;
  };
  let linkingHandlers = [];
@@ -189,7 +219,7 @@ index 5bf2a88..a6d0670 100644
  export default function useLinking(ref, _ref) {
    let {
      independent,
-@@ -251,6 +290,9 @@ export default function useLinking(ref, _ref) {
+@@ -251,6 +272,9 @@ export default function useLinking(ref, _ref) {
        // Otherwise it's likely a change triggered by `popstate`
        path !== pendingPath) {
          const historyDelta = (focusedState.history ? focusedState.history.length : focusedState.routes.length) - (previousFocusedState.history ? previousFocusedState.history.length : previousFocusedState.routes.length);
@@ -199,7 +229,7 @@ index 5bf2a88..a6d0670 100644
          if (historyDelta > 0) {
            // If history length is increased, we should pushState
            // Note that path might not actually change here, for example, drawer open should pushState
-@@ -262,34 +304,55 @@ export default function useLinking(ref, _ref) {
+@@ -262,34 +286,55 @@ export default function useLinking(ref, _ref) {
            // If history length is decreased, i.e. entries were removed, we want to go back
  
            const nextIndex = history.backIndex({
diff --git a/src/App.js b/src/App.js
index c432a0b666c8..284c6115d7b8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -22,8 +22,10 @@ import ThemeProvider from './styles/themes/ThemeProvider';
 import ThemeStylesProvider from './styles/ThemeStylesProvider';
 import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
+import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
 import * as Session from './libs/actions/Session';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
+import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
 
 // For easier debugging and development, when we are in web we expose Onyx to the window, so you can more easily set data into Onyx
 if (window && Environment.isDevelopment()) {
@@ -42,6 +44,7 @@ const fill = {flex: 1};
 
 function App() {
     useDefaultDragAndDrop();
+    OnyxUpdateManager();
     return (
         <GestureHandlerRootView style={fill}>
             <ComposeProviders
@@ -56,6 +59,7 @@ function App() {
                     KeyboardStateProvider,
                     PopoverContextProvider,
                     CurrentReportIDContextProvider,
+                    ReportAttachmentsProvider,
                     PickerStateProvider,
                     EnvironmentProvider,
                     ThemeProvider,
diff --git a/src/CONST.ts b/src/CONST.ts
index a9be263b74df..dd192f1b257c 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4,6 +4,11 @@ import * as KeyCommand from 'react-native-key-command';
 import * as Url from './libs/Url';
 import SCREENS from './SCREENS';
 
+// Creating a default array and object this way because objects ({}) and arrays ([]) are not stable types.
+// Freezing the array ensures that it cannot be unintentionally modified.
+const EMPTY_ARRAY = Object.freeze([]);
+const EMPTY_OBJECT = Object.freeze({});
+
 const CLOUDFRONT_DOMAIN = 'cloudfront.net';
 const CLOUDFRONT_URL = `https://d2k5nsl2zxldvw.${CLOUDFRONT_DOMAIN}`;
 const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'https://new.expensify.com');
@@ -234,9 +239,9 @@ const CONST = {
         PASSWORDLESS: 'passwordless',
         TASKS: 'tasks',
         THREADS: 'threads',
-        SCAN_RECEIPTS: 'scanReceipts',
         CUSTOM_STATUS: 'customStatus',
-        DISTANCE_REQUESTS: 'distanceRequests',
+        NEW_DOT_CATEGORIES: 'newDotCategories',
+        NEW_DOT_TAGS: 'newDotTags',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -288,8 +293,8 @@ const CONST = {
             },
             type: KEYBOARD_SHORTCUT_NAVIGATION_TYPE,
         },
-        NEW_GROUP: {
-            descriptionKey: 'newGroup',
+        NEW_CHAT: {
+            descriptionKey: 'newChat',
             shortcutKey: 'K',
             modifiers: ['CTRL', 'SHIFT'],
             trigger: {
@@ -410,6 +415,8 @@ const CONST = {
     EXAMPLE_PHONE_NUMBER: '+15005550006',
     CONCIERGE_CHAT_NAME: 'Concierge',
     CLOUDFRONT_URL,
+    EMPTY_ARRAY,
+    EMPTY_OBJECT,
     USE_EXPENSIFY_URL,
     NEW_ZOOM_MEETING_URL: 'https://zoom.us/start/videomeeting',
     NEW_GOOGLE_MEET_MEETING_URL: 'https://meet.google.com/new',
@@ -454,7 +461,7 @@ const CONST = {
     },
     RECEIPT: {
         ICON_SIZE: 164,
-        PERMISSION_AUTHORIZED: 'authorized',
+        PERMISSION_GRANTED: 'granted',
         HAND_ICON_HEIGHT: 152,
         HAND_ICON_WIDTH: 200,
         SHUTTER_SIZE: 90,
@@ -666,6 +673,8 @@ const CONST = {
     },
     TRANSACTION: {
         DEFAULT_MERCHANT: 'Request',
+        UNKNOWN_MERCHANT: 'Unknown Merchant',
+        PARTIAL_TRANSACTION_MERCHANT: '(none)',
         TYPE: {
             CUSTOM_UNIT: 'customUnit',
         },
@@ -752,6 +761,10 @@ const CONST = {
     // It's copied here so that the same regex pattern can be used in form validations to be consistent with the server.
     VALIDATE_FOR_HTML_TAG_REGEX: /<([^>\s]+)(?:[^>]*?)>/g,
 
+    VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX: /<([\s]+[\s\w~!@#$%^&*(){}[\];':"`|?.,/\\+\-=<]+.*[\s]*)>/g,
+
+    WHITELISTED_TAGS: [/<>/, /< >/, /<->/, /<-->/, /<br>/, /<br\/>/],
+
     PASSWORD_PAGE: {
         ERROR: {
             ALREADY_VALIDATED: 'Account already validated',
@@ -779,6 +792,10 @@ const CONST = {
 
     INVISIBLE_CODEPOINTS: ['fe0f', '200d', '2066'],
 
+    UNICODE: {
+        LTR: '\u2066',
+    },
+
     TOOLTIP_MAX_LINES: 3,
 
     LOGIN_TYPE: {
@@ -878,8 +895,6 @@ const CONST = {
         QA: 'qa@expensify.com',
         QA_TRAVIS: 'qa+travisreceipts@expensify.com',
         RECEIPTS: 'receipts@expensify.com',
-        SAASTR: 'saastr@expensify.com',
-        SBE: 'sbe@expensify.com',
         STUDENT_AMBASSADOR: 'studentambassadors@expensify.com',
         SVFG: 'svfg@expensify.com',
     },
@@ -1015,7 +1030,6 @@ const CONST = {
     },
 
     PAYMENT_METHODS: {
-        PAYPAL: 'payPalMe',
         DEBIT_CARD: 'debitCard',
         BANK_ACCOUNT: 'bankAccount',
     },
@@ -1031,7 +1045,6 @@ const CONST = {
         PAYMENT_TYPE: {
             ELSEWHERE: 'Elsewhere',
             EXPENSIFY: 'Expensify',
-            PAYPAL_ME: 'PayPal.me',
             VBBA: 'ACH',
         },
         MONEY_REQUEST_TYPE: {
@@ -1080,6 +1093,29 @@ const CONST = {
         DEFAULT: 'en',
     },
 
+    LANGUAGES: ['en', 'es'],
+
+    PRONOUNS_LIST: [
+        'coCos',
+        'eEyEmEir',
+        'heHimHis',
+        'heHimHisTheyThemTheirs',
+        'sheHerHers',
+        'sheHerHersTheyThemTheirs',
+        'merMers',
+        'neNirNirs',
+        'neeNerNers',
+        'perPers',
+        'theyThemTheirs',
+        'thonThons',
+        'veVerVis',
+        'viVir',
+        'xeXemXyr',
+        'zeZieZirHir',
+        'zeHirHirs',
+        'callMeByMyName',
+    ],
+
     POLICY: {
         TYPE: {
             FREE: 'free',
@@ -1135,6 +1171,14 @@ const CONST = {
         MENTION_ICON: 'mention-icon',
         SMALL_NORMAL: 'small-normal',
     },
+    EXPENSIFY_CARD: {
+        BANK: 'Expensify Card',
+        FRAUD_TYPES: {
+            DOMAIN: 'domain',
+            INDIVIDUAL: 'individal',
+            NONE: 'none',
+        },
+    },
     AVATAR_ROW_SIZE: {
         DEFAULT: 4,
         LARGE_SCREEN: 8,
@@ -1159,7 +1203,6 @@ const CONST = {
         CARD_NUMBER: /^[0-9]{15,16}$/,
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
-        PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
         ROOM_NAME: /^#[a-z0-9à-ÿ-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
@@ -1301,6 +1344,7 @@ const CONST = {
         SETTINGS: 'settings',
         LEAVE_ROOM: 'leaveRoom',
         WELCOME_MESSAGE: 'welcomeMessage',
+        PRIVATE_NOTES: 'privateNotes',
     },
     EDIT_REQUEST_FIELD: {
         AMOUNT: 'amount',
@@ -1363,6 +1407,9 @@ const CONST = {
         MAKE_REQUEST_WITH_SIDE_EFFECTS: 'makeRequestWithSideEffects',
     },
 
+    MAP_PADDING: 50,
+    MAP_MARKER_SIZE: 20,
+
     QUICK_REACTIONS: [
         {
             name: '+1',
@@ -2486,32 +2533,6 @@ const CONST = {
         SEARCH_ISSUES: 'https://github.com/Expensify/App/issues',
     },
 
-    PAYPAL_SUPPORTED_CURRENCIES: [
-        'AUD',
-        'BRL',
-        'CAD',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MYR',
-        'MXN',
-        'TWD',
-        'NZD',
-        'NOK',
-        'PHP',
-        'PLN',
-        'GBP',
-        'RUB',
-        'SGD',
-        'SEK',
-        'CHF',
-        'THB',
-        'USD',
-    ],
     CONCIERGE_TRAVEL_URL: 'https://community.expensify.com/discussion/7066/introducing-concierge-travel',
     SCREEN_READER_STATES: {
         ALL: 'all',
@@ -2580,6 +2601,9 @@ const CONST = {
         DISABLED: 'DISABLED',
     },
     TAB: {
+        NEW_CHAT_TAB_ID: 'NewChatTab',
+        NEW_CHAT: 'chat',
+        NEW_ROOM: 'room',
         RECEIPT_TAB_ID: 'ReceiptTab',
         MANUAL: 'manual',
         SCAN: 'scan',
@@ -2594,7 +2618,6 @@ const CONST = {
 
     SF_COORDINATES: [-122.4194, 37.7749],
 
-    MAPBOX_STYLE_URL: 'mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq',
     NAVIGATION: {
         TYPE: {
             FORCED_UP: 'FORCED_UP',
@@ -2606,11 +2629,27 @@ const CONST = {
             NAVIGATE: 'NAVIGATE',
         },
     },
-
+    INDENTS: '    ',
+    PARENT_CHILD_SEPARATOR: ': ',
+    CATEGORY_LIST_THRESHOLD: 8,
     DEMO_PAGES: {
         SAASTR: 'SaaStrDemoSetup',
         SBE: 'SbeDemoSetup',
     },
+
+    MAPBOX: {
+        PADDING: 50,
+        DEFAULT_ZOOM: 10,
+        DEFAULT_COORDINATE: [-122.4021, 37.7911],
+        STYLE_URL: 'mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq',
+    },
+    ONYX_UPDATE_TYPES: {
+        HTTPS: 'https',
+        PUSHER: 'pusher',
+    },
+    EVENTS: {
+        SCROLLING: 'scrolling',
+    },
 } as const;
 
 export default CONST;
diff --git a/src/Expensify.js b/src/Expensify.js
index 60ab9f756dff..fba65e42c06c 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -30,8 +30,6 @@ import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import * as DemoActions from './libs/actions/DemoActions';
-import DownloadAppModal from './components/DownloadAppModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
@@ -168,13 +166,11 @@ function Expensify(props) {
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
-            DemoActions.runDemoByURL(url);
             Report.openReportFromDeepLink(url, isAuthenticated);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            DemoActions.runDemoByURL(state.url);
             Report.openReportFromDeepLink(state.url, isAuthenticated);
         });
 
@@ -196,7 +192,6 @@ function Expensify(props) {
         <DeeplinkWrapper isAuthenticated={isAuthenticated}>
             {shouldInit && (
                 <>
-                    <DownloadAppModal isAuthenticated={isAuthenticated} />
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index eca271c12217..af060ea58901 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1,4 +1,5 @@
 import {ValueOf} from 'type-fest';
+import {OnyxUpdate} from 'react-native-onyx';
 import DeepValueOf from './types/utils/DeepValueOf';
 import * as OnyxTypes from './types/onyx';
 import CONST from './CONST';
@@ -87,13 +88,7 @@ const ONYXKEYS = {
     SESSION: 'session',
     BETAS: 'betas',
 
-    /** Denotes if the Download App Banner has been dismissed */
-    SHOW_DOWNLOAD_APP_BANNER: 'showDownloadAppBanner',
-
     /** NVP keys
-     * Contains the user's payPalMe data */
-    PAYPAL: 'paypal',
-
     /** Contains the user preference for the LHN priority mode */
     NVP_PRIORITY_MODE: 'nvp_priorityMode',
 
@@ -142,11 +137,11 @@ const ONYXKEYS = {
     /** The user's bank accounts */
     BANK_ACCOUNT_LIST: 'bankAccountList',
 
-    /** The user's credit cards (renamed from cardList) */
+    /** The user's payment and P2P cards */
     FUND_LIST: 'fundList',
 
-    // The user's Expensify cards
-    CORPORATE_CARD_LIST: 'corporateCardList',
+    /** The user's cash card and imported cards (including the Expensify Card) */
+    CARD_LIST: 'cardList',
 
     /** Stores information about the user's saved statements */
     WALLET_STATEMENT: 'walletStatement',
@@ -215,9 +210,6 @@ const ONYXKEYS = {
     // The last update ID that was applied to the client
     ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT: 'OnyxUpdatesLastUpdateIDAppliedToClient',
 
-    // Manual request tab selector
-    SELECTED_TAB: 'selectedTab',
-
     // Receipt upload modal
     RECEIPT_MODAL: 'receiptModal',
 
@@ -242,6 +234,9 @@ const ONYXKEYS = {
         POLICY: 'policy_',
         POLICY_MEMBERS: 'policyMembers_',
         POLICY_CATEGORIES: 'policyCategories_',
+        POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
+        POLICY_TAGS: 'policyTags_',
+        POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         REPORT: 'report_',
         REPORT_ACTIONS: 'reportActions_',
@@ -254,6 +249,9 @@ const ONYXKEYS = {
         SECURITY_GROUP: 'securityGroup_',
         TRANSACTION: 'transactions_',
 
+        // Manual request tab selector
+        SELECTED_TAB: 'selectedTab_',
+
         /** This is deprecated, but needed for a migration, so we still need to include it here so that it will be initialized in Onyx.init */
         DEPRECATED_POLICY_MEMBER_LIST: 'policyMemberList_',
     },
@@ -281,12 +279,12 @@ const ONYXKEYS = {
         MONEY_REQUEST_AMOUNT_FORM: 'moneyRequestAmountForm',
         MONEY_REQUEST_DATE_FORM: 'moneyRequestCreatedForm',
         NEW_CONTACT_METHOD_FORM: 'newContactMethodForm',
-        PAYPAL_FORM: 'payPalForm',
         WAYPOINT_FORM: 'waypointForm',
         WAYPOINT_FORM_DRAFT: 'waypointFormDraft',
         SETTINGS_STATUS_SET_FORM: 'settingsStatusSetForm',
         SETTINGS_STATUS_CLEAR_AFTER_FORM: 'settingsStatusClearAfterForm',
         SETTINGS_STATUS_SET_CLEAR_AFTER_FORM: 'settingsStatusSetClearAfterForm',
+        PRIVATE_NOTES_FORM: 'privateNotesForm',
         I_KNOW_A_TEACHER_FORM: 'iKnowTeacherForm',
         INTRO_SCHOOL_PRINCIPAL_FORM: 'introSchoolPrincipalForm',
     },
@@ -303,9 +301,8 @@ type OnyxValues = {
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
-    [ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER]: boolean;
     [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.Request[];
-    [ONYXKEYS.QUEUED_ONYX_UPDATES]: OnyxTypes.QueuedOnyxUpdates;
+    [ONYXKEYS.QUEUED_ONYX_UPDATES]: OnyxUpdate[];
     [ONYXKEYS.CURRENT_DATE]: string;
     [ONYXKEYS.CREDENTIALS]: OnyxTypes.Credentials;
     [ONYXKEYS.IOU]: OnyxTypes.IOU;
@@ -324,7 +321,6 @@ type OnyxValues = {
     [ONYXKEYS.LOGIN_LIST]: OnyxTypes.Login;
     [ONYXKEYS.SESSION]: OnyxTypes.Session;
     [ONYXKEYS.BETAS]: OnyxTypes.Beta[];
-    [ONYXKEYS.PAYPAL]: OnyxTypes.Paypal;
     [ONYXKEYS.NVP_PRIORITY_MODE]: ValueOf<typeof CONST.PRIORITY_MODE>;
     [ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE]: OnyxTypes.BlockedFromConcierge;
     [ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID]: string;
@@ -341,7 +337,8 @@ type OnyxValues = {
     [ONYXKEYS.WALLET_ADDITIONAL_DETAILS]: OnyxTypes.WalletAdditionalDetails;
     [ONYXKEYS.WALLET_TERMS]: OnyxTypes.WalletTerms;
     [ONYXKEYS.BANK_ACCOUNT_LIST]: Record<string, OnyxTypes.BankAccount>;
-    [ONYXKEYS.FUND_LIST]: Record<string, OnyxTypes.Card>;
+    [ONYXKEYS.FUND_LIST]: Record<string, OnyxTypes.Fund>;
+    [ONYXKEYS.CARD_LIST]: Record<string, OnyxTypes.Card>;
     [ONYXKEYS.WALLET_STATEMENT]: OnyxTypes.WalletStatement;
     [ONYXKEYS.PERSONAL_BANK_ACCOUNT]: OnyxTypes.PersonalBankAccount;
     [ONYXKEYS.REIMBURSEMENT_ACCOUNT]: OnyxTypes.ReimbursementAccount;
@@ -362,10 +359,9 @@ type OnyxValues = {
     [ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID]: string;
     [ONYXKEYS.PREFERRED_THEME]: ValueOf<typeof CONST.THEME>;
     [ONYXKEYS.IS_USING_MEMORY_ONLY_KEYS]: boolean;
-    [ONYXKEYS.SELECTED_TAB]: string;
     [ONYXKEYS.RECEIPT_MODAL]: OnyxTypes.ReceiptModal;
     [ONYXKEYS.MAPBOX_ACCESS_TOKEN]: OnyxTypes.MapboxAccessToken;
-    [ONYXKEYS.ONYX_UPDATES_FROM_SERVER]: number;
+    [ONYXKEYS.ONYX_UPDATES_FROM_SERVER]: OnyxTypes.OnyxUpdatesFromServer;
     [ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT]: number;
     [ONYXKEYS.MAX_CANVAS_AREA]: number;
     [ONYXKEYS.MAX_CANVAS_HEIGHT]: number;
@@ -374,8 +370,10 @@ type OnyxValues = {
     // Collections
     [ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
     [ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
-    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: unknown;
+    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategory;
+    [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTag;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMember;
+    [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: Record<string, number>;
     [ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
@@ -388,6 +386,8 @@ type OnyxValues = {
     [ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING]: boolean;
     [ONYXKEYS.COLLECTION.SECURITY_GROUP]: OnyxTypes.SecurityGroup;
     [ONYXKEYS.COLLECTION.TRANSACTION]: OnyxTypes.Transaction;
+    [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS]: OnyxTypes.RecentlyUsedTags;
+    [ONYXKEYS.COLLECTION.SELECTED_TAB]: string;
 
     // Forms
     [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: OnyxTypes.AddDebitCardForm;
@@ -412,7 +412,6 @@ type OnyxValues = {
     [ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: OnyxTypes.Form;
-    [ONYXKEYS.FORMS.PAYPAL_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.WAYPOINT_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.WAYPOINT_FORM_DRAFT]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM]: OnyxTypes.Form;
diff --git a/src/ROUTES.js b/src/ROUTES.ts
similarity index 56%
rename from src/ROUTES.js
rename to src/ROUTES.ts
index b38ce25f590f..2c37116db395 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.ts
@@ -1,13 +1,18 @@
-import lodashGet from 'lodash/get';
+import {ValueOf} from 'type-fest';
 import * as Url from './libs/Url';
+import CONST from './CONST';
 
 /**
  * This is a file containing constants for all of the routes we want to be able to go to
  */
 
+type ParseReportRouteParams = {
+    reportID: string;
+    isSubReportPageRoute: boolean;
+};
+
 const REPORT = 'r';
 const IOU_REQUEST = 'request/new';
-const IOU_BILL = 'split/new';
 const IOU_SEND = 'send/new';
 const NEW_TASK = 'new/task';
 const SETTINGS_PERSONAL_DETAILS = 'settings/profile/personal-details';
@@ -20,7 +25,7 @@ export default {
     BANK_ACCOUNT_NEW: 'bank-account/new',
     BANK_ACCOUNT_WITH_STEP_TO_OPEN: 'bank-account/:stepToOpen?',
     BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
-    getBankAccountRoute: (stepToOpen = '', policyID = '', backTo = '') => {
+    getBankAccountRoute: (stepToOpen = '', policyID = '', backTo = ''): string => {
         const backToParam = backTo ? `&backTo=${encodeURIComponent(backTo)}` : '';
         return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`;
     },
@@ -43,11 +48,10 @@ export default {
     SETTINGS_ABOUT: 'settings/about',
     SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links',
     SETTINGS_WALLET: 'settings/wallet',
-    SETTINGS_ADD_PAYPAL_ME: 'settings/wallet/add-paypal-me',
     SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
     SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
     SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments',
-    getSettingsAddLoginRoute: (type) => `settings/addlogin/${type}`,
+    getSettingsAddLoginRoute: (type: string) => `settings/addlogin/${type}`,
     SETTINGS_WALLET_TRANSFER_BALANCE: 'settings/wallet/transfer-balance',
     SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT: 'settings/wallet/choose-transfer-account',
     SETTINGS_PERSONAL_DETAILS,
@@ -56,31 +60,31 @@ export default {
     SETTINGS_PERSONAL_DETAILS_ADDRESS: `${SETTINGS_PERSONAL_DETAILS}/address`,
     SETTINGS_CONTACT_METHODS,
     SETTINGS_CONTACT_METHOD_DETAILS: `${SETTINGS_CONTACT_METHODS}/:contactMethod/details`,
-    getEditContactMethodRoute: (contactMethod) => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
+    getEditContactMethodRoute: (contactMethod: string) => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
     SETTINGS_NEW_CONTACT_METHOD: `${SETTINGS_CONTACT_METHODS}/new`,
     SETTINGS_2FA: 'settings/security/two-factor-auth',
     SETTINGS_STATUS,
     SETTINGS_STATUS_SET,
-    NEW_GROUP: 'new/group',
+    NEW: 'new',
     NEW_CHAT: 'new/chat',
+    NEW_ROOM: 'new/room',
     NEW_TASK,
     REPORT,
-    REPORT_WITH_ID: 'r/:reportID/:reportActionID?',
+    REPORT_WITH_ID: 'r/:reportID?/:reportActionID?',
     EDIT_REQUEST: 'r/:threadReportID/edit/:field',
-    getEditRequestRoute: (threadReportID, field) => `r/${threadReportID}/edit/${field}`,
+    getEditRequestRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}`,
     EDIT_CURRENCY_REQUEST: 'r/:threadReportID/edit/currency',
-    getEditRequestCurrencyRoute: (threadReportID, currency, backTo) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}`,
-    getReportRoute: (reportID) => `r/${reportID}`,
+    getEditRequestCurrencyRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}`,
+    getReportRoute: (reportID: string) => `r/${reportID}`,
     REPORT_WITH_ID_DETAILS_SHARE_CODE: 'r/:reportID/details/shareCode',
-    getReportShareCodeRoute: (reportID) => `r/${reportID}/details/shareCode`,
+    getReportShareCodeRoute: (reportID: string) => `r/${reportID}/details/shareCode`,
     REPORT_ATTACHMENTS: 'r/:reportID/attachment',
-    getReportAttachmentRoute: (reportID, source) => `r/${reportID}/attachment?source=${encodeURI(source)}`,
+    getReportAttachmentRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURI(source)}`,
 
     /** This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated */
     CONCIERGE: 'concierge',
 
     IOU_REQUEST,
-    IOU_BILL,
     IOU_SEND,
 
     // To see the available iouType, please refer to CONST.IOU.MONEY_REQUEST_TYPE
@@ -92,83 +96,95 @@ export default {
     MONEY_REQUEST_CURRENCY: ':iouType/new/currency/:reportID?',
     MONEY_REQUEST_DESCRIPTION: ':iouType/new/description/:reportID?',
     MONEY_REQUEST_CATEGORY: ':iouType/new/category/:reportID?',
+    MONEY_REQUEST_TAG: ':iouType/new/tag/:reportID?',
     MONEY_REQUEST_MERCHANT: ':iouType/new/merchant/:reportID?',
     MONEY_REQUEST_MANUAL_TAB: ':iouType/new/:reportID?/manual',
     MONEY_REQUEST_SCAN_TAB: ':iouType/new/:reportID?/scan',
     MONEY_REQUEST_DISTANCE_TAB: ':iouType/new/:reportID?/distance',
     MONEY_REQUEST_WAYPOINT: ':iouType/new/waypoint/:waypointIndex',
+    MONEY_REQUEST_ADDRESS: ':iouType/new/address/:reportID?',
     IOU_SEND_ADD_BANK_ACCOUNT: `${IOU_SEND}/add-bank-account`,
     IOU_SEND_ADD_DEBIT_CARD: `${IOU_SEND}/add-debit-card`,
     IOU_SEND_ENABLE_PAYMENTS: `${IOU_SEND}/enable-payments`,
-    getMoneyRequestRoute: (iouType, reportID = '') => `${iouType}/new/${reportID}`,
-    getMoneyRequestAmountRoute: (iouType, reportID = '') => `${iouType}/new/amount/${reportID}`,
-    getMoneyRequestParticipantsRoute: (iouType, reportID = '') => `${iouType}/new/participants/${reportID}`,
-    getMoneyRequestConfirmationRoute: (iouType, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
-    getMoneyRequestCreatedRoute: (iouType, reportID = '') => `${iouType}/new/date/${reportID}`,
-    getMoneyRequestCurrencyRoute: (iouType, reportID = '', currency, backTo) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
-    getMoneyRequestDescriptionRoute: (iouType, reportID = '') => `${iouType}/new/description/${reportID}`,
-    getMoneyRequestCategoryRoute: (iouType, reportID = '') => `${iouType}/new/category/${reportID}`,
-    getMoneyRequestMerchantRoute: (iouType, reportID = '') => `${iouType}/new/merchant/${reportID}`,
-    getMoneyRequestDistanceTabRoute: (iouType, reportID = '') => `${iouType}/new/${reportID}/distance`,
-    getMoneyRequestWaypointRoute: (iouType, waypointIndex) => `${iouType}/new/waypoint/${waypointIndex}`,
+    getMoneyRequestRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}`,
+    getMoneyRequestAmountRoute: (iouType: string, reportID = '') => `${iouType}/new/amount/${reportID}`,
+    getMoneyRequestParticipantsRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}`,
+    getMoneyRequestConfirmationRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
+    getMoneyRequestCreatedRoute: (iouType: string, reportID = '') => `${iouType}/new/date/${reportID}`,
+    getMoneyRequestCurrencyRoute: (iouType: string, reportID: string, currency: string, backTo: string) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
+    getMoneyRequestDescriptionRoute: (iouType: string, reportID = '') => `${iouType}/new/description/${reportID}`,
+    getMoneyRequestCategoryRoute: (iouType: string, reportID = '') => `${iouType}/new/category/${reportID}`,
+    getMoneyRequestMerchantRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`,
+    getMoneyRequestDistanceTabRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`,
+    getMoneyRequestWaypointRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`,
+    getMoneyRequestAddressRoute: (iouType: string, reportID = '') => `${iouType}/new/address/${reportID}`,
+    getMoneyRequestTagRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`,
     SPLIT_BILL_DETAILS: `r/:reportID/split/:reportActionID`,
-    getSplitBillDetailsRoute: (reportID, reportActionID) => `r/${reportID}/split/${reportActionID}`,
-    getNewTaskRoute: (reportID) => `${NEW_TASK}/${reportID}`,
+    getSplitBillDetailsRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`,
+    getNewTaskRoute: (reportID: string) => `${NEW_TASK}/${reportID}`,
     NEW_TASK_WITH_REPORT_ID: `${NEW_TASK}/:reportID?`,
     TASK_TITLE: 'r/:reportID/title',
     TASK_DESCRIPTION: 'r/:reportID/description',
     TASK_ASSIGNEE: 'r/:reportID/assignee',
-    getTaskReportTitleRoute: (reportID) => `r/${reportID}/title`,
-    getTaskReportDescriptionRoute: (reportID) => `r/${reportID}/description`,
-    getTaskReportAssigneeRoute: (reportID) => `r/${reportID}/assignee`,
+    getTaskReportTitleRoute: (reportID: string) => `r/${reportID}/title`,
+    getTaskReportDescriptionRoute: (reportID: string) => `r/${reportID}/description`,
+    getTaskReportAssigneeRoute: (reportID: string) => `r/${reportID}/assignee`,
     NEW_TASK_ASSIGNEE: `${NEW_TASK}/assignee`,
     NEW_TASK_SHARE_DESTINATION: `${NEW_TASK}/share-destination`,
     NEW_TASK_DETAILS: `${NEW_TASK}/details`,
     NEW_TASK_TITLE: `${NEW_TASK}/title`,
     NEW_TASK_DESCRIPTION: `${NEW_TASK}/description`,
     FLAG_COMMENT: `flag/:reportID/:reportActionID`,
-    getFlagCommentRoute: (reportID, reportActionID) => `flag/${reportID}/${reportActionID}`,
+    getFlagCommentRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}`,
     SEARCH: 'search',
-    SAVE_THE_WORLD: 'save-the-world',
-    I_KNOW_A_TEACHER: 'save-the-world/i-know-a-teacher',
-    INTRO_SCHOOL_PRINCIPAL: 'save-the-world/intro-school-principal',
-    I_AM_A_TEACHER: 'save-the-world/i-am-a-teacher',
+    TEACHERS_UNITE: 'teachersunite',
+    I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher',
+    INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal',
+    I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher',
     DETAILS: 'details',
-    getDetailsRoute: (login) => `details?login=${encodeURIComponent(login)}`,
+    getDetailsRoute: (login: string) => `details?login=${encodeURIComponent(login)}`,
     PROFILE: 'a/:accountID',
-    getProfileRoute: (accountID, backTo = '') => {
+    getProfileRoute: (accountID: string | number, backTo = '') => {
         const backToParam = backTo ? `?backTo=${encodeURIComponent(backTo)}` : '';
         return `a/${accountID}${backToParam}`;
     },
     REPORT_PARTICIPANTS: 'r/:reportID/participants',
-    getReportParticipantsRoute: (reportID) => `r/${reportID}/participants`,
+    getReportParticipantsRoute: (reportID: string) => `r/${reportID}/participants`,
     REPORT_WITH_ID_DETAILS: 'r/:reportID/details',
-    getReportDetailsRoute: (reportID) => `r/${reportID}/details`,
+    getReportDetailsRoute: (reportID: string) => `r/${reportID}/details`,
     REPORT_SETTINGS: 'r/:reportID/settings',
-    getReportSettingsRoute: (reportID) => `r/${reportID}/settings`,
+    getReportSettingsRoute: (reportID: string) => `r/${reportID}/settings`,
     REPORT_SETTINGS_ROOM_NAME: 'r/:reportID/settings/room-name',
-    getReportSettingsRoomNameRoute: (reportID) => `r/${reportID}/settings/room-name`,
+    getReportSettingsRoomNameRoute: (reportID: string) => `r/${reportID}/settings/room-name`,
     REPORT_SETTINGS_NOTIFICATION_PREFERENCES: 'r/:reportID/settings/notification-preferences',
-    getReportSettingsNotificationPreferencesRoute: (reportID) => `r/${reportID}/settings/notification-preferences`,
+    getReportSettingsNotificationPreferencesRoute: (reportID: string) => `r/${reportID}/settings/notification-preferences`,
     REPORT_WELCOME_MESSAGE: 'r/:reportID/welcomeMessage',
-    getReportWelcomeMessageRoute: (reportID) => `r/${reportID}/welcomeMessage`,
+    getReportWelcomeMessageRoute: (reportID: string) => `r/${reportID}/welcomeMessage`,
     REPORT_SETTINGS_WRITE_CAPABILITY: 'r/:reportID/settings/who-can-post',
-    getReportSettingsWriteCapabilityRoute: (reportID) => `r/${reportID}/settings/who-can-post`,
+    getReportSettingsWriteCapabilityRoute: (reportID: string) => `r/${reportID}/settings/who-can-post`,
     TRANSITION_BETWEEN_APPS: 'transition',
     VALIDATE_LOGIN: 'v/:accountID/:validateCode',
     GET_ASSISTANCE: 'get-assistance/:taskID',
-    getGetAssistanceRoute: (taskID) => `get-assistance/${taskID}`,
+    getGetAssistanceRoute: (taskID: string) => `get-assistance/${taskID}`,
     UNLINK_LOGIN: 'u/:accountID/:validateCode',
 
     APPLE_SIGN_IN: 'sign-in-with-apple',
     GOOGLE_SIGN_IN: 'sign-in-with-google',
     DESKTOP_SIGN_IN_REDIRECT: 'desktop-signin-redirect',
 
+    // Routes related to private notes added to the report
+    PRIVATE_NOTES_VIEW: 'r/:reportID/notes/:accountID',
+    getPrivateNotesViewRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}`,
+    PRIVATE_NOTES_LIST: 'r/:reportID/notes',
+    getPrivateNotesListRoute: (reportID: string) => `r/${reportID}/notes`,
+    PRIVATE_NOTES_EDIT: 'r/:reportID/notes/:accountID/edit',
+    getPrivateNotesEditRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}/edit`,
+
     // This is a special validation URL that will take the user to /workspace/new after validation. This is used
     // when linking users from e.com in order to share a session in this app.
     ENABLE_PAYMENTS: 'enable-payments',
     WALLET_STATEMENT_WITH_DATE: 'statements/:yearMonth',
-    getWalletStatementWithDateRoute: (yearMonth) => `statements/${yearMonth}`,
+    getWalletStatementWithDateRoute: (yearMonth: string) => `statements/${yearMonth}`,
     WORKSPACE_NEW: 'workspace/new',
     WORKSPACE_INITIAL: 'workspace/:policyID',
     WORKSPACE_INVITE: 'workspace/:policyID/invite',
@@ -182,27 +198,23 @@ export default {
     WORKSPACE_TRAVEL: 'workspace/:policyID/travel',
     WORKSPACE_MEMBERS: 'workspace/:policyID/members',
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
-    getWorkspaceInitialRoute: (policyID) => `workspace/${policyID}`,
-    getWorkspaceInviteRoute: (policyID) => `workspace/${policyID}/invite`,
-    getWorkspaceInviteMessageRoute: (policyID) => `workspace/${policyID}/invite-message`,
-    getWorkspaceSettingsRoute: (policyID) => `workspace/${policyID}/settings`,
-    getWorkspaceCardRoute: (policyID) => `workspace/${policyID}/card`,
-    getWorkspaceReimburseRoute: (policyID) => `workspace/${policyID}/reimburse`,
-    getWorkspaceRateAndUnitRoute: (policyID) => `workspace/${policyID}/rateandunit`,
-    getWorkspaceBillsRoute: (policyID) => `workspace/${policyID}/bills`,
-    getWorkspaceInvoicesRoute: (policyID) => `workspace/${policyID}/invoices`,
-    getWorkspaceTravelRoute: (policyID) => `workspace/${policyID}/travel`,
-    getWorkspaceMembersRoute: (policyID) => `workspace/${policyID}/members`,
+    getWorkspaceInitialRoute: (policyID: string) => `workspace/${policyID}`,
+    getWorkspaceInviteRoute: (policyID: string) => `workspace/${policyID}/invite`,
+    getWorkspaceInviteMessageRoute: (policyID: string) => `workspace/${policyID}/invite-message`,
+    getWorkspaceSettingsRoute: (policyID: string) => `workspace/${policyID}/settings`,
+    getWorkspaceCardRoute: (policyID: string) => `workspace/${policyID}/card`,
+    getWorkspaceReimburseRoute: (policyID: string) => `workspace/${policyID}/reimburse`,
+    getWorkspaceRateAndUnitRoute: (policyID: string) => `workspace/${policyID}/rateandunit`,
+    getWorkspaceBillsRoute: (policyID: string) => `workspace/${policyID}/bills`,
+    getWorkspaceInvoicesRoute: (policyID: string) => `workspace/${policyID}/invoices`,
+    getWorkspaceTravelRoute: (policyID: string) => `workspace/${policyID}/travel`,
+    getWorkspaceMembersRoute: (policyID: string) => `workspace/${policyID}/members`,
 
     // These are some on-off routes that will be removed once they're no longer needed (see GH issues for details)
     SAASTR: 'saastr',
     SBE: 'sbe',
 
-    /**
-     * @param {String} route
-     * @returns {Object}
-     */
-    parseReportRouteParams: (route) => {
+    parseReportRouteParams: (route: string): ParseReportRouteParams => {
         let parsingRoute = route;
         if (parsingRoute.at(0) === '/') {
             // remove the first slash
@@ -215,9 +227,9 @@ export default {
 
         const pathSegments = parsingRoute.split('/');
         return {
-            reportID: lodashGet(pathSegments, 1),
+            reportID: pathSegments[1],
             isSubReportPageRoute: pathSegments.length > 2,
         };
     },
     SIGN_IN_MODAL: 'sign-in-modal',
-};
+} as const;
diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
index 7f1544a758f4..399247a35676 100644
--- a/src/components/AddPaymentMethodMenu.js
+++ b/src/components/AddPaymentMethodMenu.js
@@ -10,7 +10,6 @@ import withWindowDimensions from './withWindowDimensions';
 import Permissions from '../libs/Permissions';
 import PopoverMenu from './PopoverMenu';
 import refPropTypes from './refPropTypes';
-import paypalMeDataPropTypes from './paypalMeDataPropTypes';
 
 const propTypes = {
     /** Should the component be visible? */
@@ -25,12 +24,6 @@ const propTypes = {
         vertical: PropTypes.number,
     }),
 
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
-    /** Should we show the Paypal option */
-    shouldShowPaypal: PropTypes.bool,
-
     /** List of betas available to current user */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -42,8 +35,6 @@ const propTypes = {
 
 const defaultProps = {
     anchorPosition: {},
-    payPalMeData: {},
-    shouldShowPaypal: true,
     betas: [],
     anchorRef: () => {},
 };
@@ -73,15 +64,6 @@ function AddPaymentMethodMenu(props) {
                           },
                       ]
                     : []),
-                ...(props.shouldShowPaypal && !props.payPalMeData.description
-                    ? [
-                          {
-                              text: props.translate('common.payPalMe'),
-                              icon: Expensicons.PayPal,
-                              onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL),
-                          },
-                      ]
-                    : []),
             ]}
             withoutOverlay
         />
@@ -96,9 +78,6 @@ export default compose(
     withWindowDimensions,
     withLocalize,
     withOnyx({
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         betas: {
             key: ONYXKEYS.BETAS,
         },
diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index dbe7e46ff6aa..e2843ba7fae8 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
-import React, {useEffect, useRef, useCallback} from 'react';
+import React, {useEffect, useRef, useCallback, useMemo} from 'react';
 import {ActivityIndicator, View} from 'react-native';
+import {useIsFocused} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -38,6 +39,9 @@ const propTypes = {
     /** Fired when the user exits the Plaid flow */
     onExitPlaid: PropTypes.func,
 
+    /** Fired when the screen is blurred */
+    onBlurPlaid: PropTypes.func,
+
     /** Fired when the user selects an account */
     onSelect: PropTypes.func,
 
@@ -61,6 +65,7 @@ const defaultProps = {
     selectedPlaidAccountID: '',
     plaidLinkToken: '',
     onExitPlaid: () => {},
+    onBlurPlaid: () => {},
     onSelect: () => {},
     text: '',
     receivedRedirectURI: null,
@@ -75,6 +80,7 @@ function AddPlaidBankAccount({
     selectedPlaidAccountID,
     plaidLinkToken,
     onExitPlaid,
+    onBlurPlaid,
     onSelect,
     text,
     receivedRedirectURI,
@@ -88,6 +94,7 @@ function AddPlaidBankAccount({
 
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const isFocused = useIsFocused();
 
     /**
      * @returns {String}
@@ -102,6 +109,11 @@ function AddPlaidBankAccount({
         }
     };
 
+    /**
+     * @returns {Array}
+     */
+    const plaidBankAccounts = useMemo(() => lodashGet(plaidData, 'bankAccounts') || [], [plaidData]);
+
     /**
      * @returns {Boolean}
      * I'm using useCallback so the useEffect which uses this function doesn't run on every render.
@@ -151,6 +163,13 @@ function AddPlaidBankAccount({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
+    useEffect(() => {
+        if (isFocused || plaidBankAccounts.length) {
+            return;
+        }
+        onBlurPlaid();
+    }, [isFocused, onBlurPlaid, plaidBankAccounts.length]);
+
     useEffect(() => {
         // If we are coming back from offline and we haven't authenticated with Plaid yet, we need to re-run our call to kick off Plaid
         // previousNetworkState.current also makes sure that this doesn't run on the first render.
@@ -160,7 +179,6 @@ function AddPlaidBankAccount({
         previousNetworkState.current = isOffline;
     }, [allowDebit, bankAccountID, isAuthenticatedWithPlaid, isOffline]);
 
-    const plaidBankAccounts = lodashGet(plaidData, 'bankAccounts') || [];
     const token = getPlaidLinkToken();
     const options = _.map(plaidBankAccounts, (account) => ({
         value: account.plaidAccountID,
diff --git a/src/components/AddressSearch/index.js b/src/components/AddressSearch/index.js
index e761ebeed26b..bd6492b4237b 100644
--- a/src/components/AddressSearch/index.js
+++ b/src/components/AddressSearch/index.js
@@ -95,6 +95,9 @@ const propTypes = {
     /** Maximum number of characters allowed in search input */
     maxInputLength: PropTypes.number,
 
+    /** The result types to return from the Google Places Autocomplete request */
+    resultTypes: PropTypes.string,
+
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
@@ -123,6 +126,7 @@ const defaultProps = {
     },
     maxInputLength: undefined,
     predefinedPlaces: [],
+    resultTypes: 'address',
 };
 
 // Do not convert to class component! It's been tried before and presents more challenges than it's worth.
@@ -134,10 +138,10 @@ function AddressSearch(props) {
     const query = useMemo(
         () => ({
             language: props.preferredLocale,
-            types: 'address',
+            types: props.resultTypes,
             components: props.isLimitedToUSA ? 'country:us' : undefined,
         }),
-        [props.preferredLocale, props.isLimitedToUSA],
+        [props.preferredLocale, props.resultTypes, props.isLimitedToUSA],
     );
 
     const saveLocationDetails = (autocompleteData, details) => {
@@ -296,7 +300,7 @@ function AddressSearch(props) {
                     query={query}
                     requestUrl={{
                         useOnPlatform: 'all',
-                        url: ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces&proxyUrl='}),
+                        url: props.network.isOffline ? null : ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces&proxyUrl='}),
                     }}
                     textInputProps={{
                         InputComp: TextInput,
diff --git a/src/components/AnimatedStep/index.js b/src/components/AnimatedStep/index.js
index a8b9b80fcc0e..5b0dc8bc78fa 100644
--- a/src/components/AnimatedStep/index.js
+++ b/src/components/AnimatedStep/index.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import * as Animatable from 'react-native-animatable';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
+import useNativeDriver from '../../libs/useNativeDriver';
 
 const propTypes = {
     /** Children to wrap in AnimatedStep. */
@@ -47,7 +48,7 @@ function AnimatedStep(props) {
             }}
             duration={CONST.ANIMATED_TRANSITION}
             animation={getAnimationStyle(props.direction)}
-            useNativeDriver
+            useNativeDriver={useNativeDriver}
             style={props.style}
         >
             {props.children}
diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index 70741f352089..71d331b68db0 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -2,6 +2,7 @@ import lodashGet from 'lodash/get';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'lodash';
 import CONST from '../CONST';
 import Banner from './Banner';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -60,15 +61,25 @@ function ArchivedReportFooter(props) {
         oldDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetails, [oldAccountID, 'displayName']);
     }
 
+    const shouldRenderHTML = archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+
+    let policyName = ReportUtils.getPolicyName(props.report);
+
+    if (shouldRenderHTML) {
+        oldDisplayName = _.escape(oldDisplayName);
+        displayName = _.escape(displayName);
+        policyName = _.escape(policyName);
+    }
+
     return (
         <Banner
             containerStyles={[styles.archivedReportFooter]}
             text={props.translate(`reportArchiveReasons.${archiveReason}`, {
                 displayName: `<strong>${displayName}</strong>`,
                 oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-                policyName: `<strong>${ReportUtils.getPolicyName(props.report)}</strong>`,
+                policyName: `<strong>${policyName}</strong>`,
             })}
-            shouldRenderHTML={archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT}
+            shouldRenderHTML={shouldRenderHTML}
             shouldShowIcon
         />
     );
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index c07a4474a68b..bbb0662132d2 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -25,7 +25,7 @@ import HeaderGap from './HeaderGap';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
 import reportPropTypes from '../pages/reportPropTypes';
-import tryResolveUrlFromApiRoot from '../libs/tryResolveUrlFromApiRoot';
+import useNativeDriver from '../libs/useNativeDriver';
 
 /**
  * Modal render prop component that exposes modal launching triggers that can be used
@@ -295,7 +295,7 @@ function AttachmentModal(props) {
             Animated.timing(confirmButtonFadeAnimation, {
                 toValue,
                 duration: 100,
-                useNativeDriver: true,
+                useNativeDriver,
             }).start();
         },
         [confirmButtonFadeAnimation],
@@ -351,7 +351,7 @@ function AttachmentModal(props) {
                         <AttachmentCarousel
                             report={props.report}
                             onNavigate={onNavigate}
-                            source={tryResolveUrlFromApiRoot(props.source)}
+                            source={props.source}
                             onClose={closeModal}
                             onToggleKeyboard={updateConfirmButtonVisibility}
                             setDownloadButtonVisibility={setDownloadButtonVisibility}
diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index 9ea94ae53d42..9930fa49a909 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -1,6 +1,7 @@
 import React, {useRef} from 'react';
 import CONST from '../../CONST';
 import {propTypes, defaultProps} from './attachmentPickerPropTypes';
+import Visibility from '../../libs/Visibility';
 
 /**
  * Returns acceptable FileTypes based on ATTACHMENT_PICKER_TYPE
@@ -53,7 +54,23 @@ function AttachmentPicker(props) {
                     if (!fileInput.current) {
                         return;
                     }
-                    fileInput.current.addEventListener('cancel', () => onCanceled.current(), {once: true});
+                    fileInput.current.addEventListener(
+                        'cancel',
+                        () => {
+                            // For Android Chrome, the cancel event happens before the page is visible on physical devices,
+                            // which makes it unreliable for us to show the keyboard, while on emulators it happens after the page is visible.
+                            // So here we can delay calling the onCanceled.current function based on visibility in order to reliably show the keyboard.
+                            if (Visibility.isVisible()) {
+                                onCanceled.current();
+                                return;
+                            }
+                            const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+                                onCanceled.current();
+                                unsubscribeVisibilityListener();
+                            });
+                        },
+                        {once: true},
+                    );
                 }}
                 accept={getAcceptableFileTypes(props.type)}
             />
diff --git a/src/components/Attachments/AttachmentCarousel/CarouselItem.js b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
new file mode 100644
index 000000000000..3aeef8482e2d
--- /dev/null
+++ b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
@@ -0,0 +1,115 @@
+import React, {useContext, useState} from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import CONST from '../../../CONST';
+import styles from '../../../styles/styles';
+import useLocalize from '../../../hooks/useLocalize';
+import PressableWithoutFeedback from '../../Pressable/PressableWithoutFeedback';
+import Text from '../../Text';
+import Button from '../../Button';
+import AttachmentView from '../AttachmentView';
+import SafeAreaConsumer from '../../SafeAreaConsumer';
+import ReportAttachmentsContext from '../../../pages/home/report/ReportAttachmentsContext';
+
+const propTypes = {
+    /** Attachment required information such as the source and file name */
+    item: PropTypes.shape({
+        /** Report action ID of the attachment */
+        reportActionID: PropTypes.string,
+
+        /** Whether source URL requires authentication */
+        isAuthTokenRequired: PropTypes.bool,
+
+        /** The source (URL) of the attachment */
+        source: PropTypes.string,
+
+        /** Additional information about the attachment file */
+        file: PropTypes.shape({
+            /** File name of the attachment */
+            name: PropTypes.string,
+        }),
+
+        /** Whether the attachment has been flagged */
+        hasBeenFlagged: PropTypes.bool,
+    }).isRequired,
+
+    /** Whether the attachment is currently being viewed in the carousel */
+    isFocused: PropTypes.bool.isRequired,
+
+    /** onPress callback */
+    onPress: PropTypes.func,
+};
+
+const defaultProps = {
+    onPress: undefined,
+};
+
+function CarouselItem({item, isFocused, onPress}) {
+    const {translate} = useLocalize();
+    const {isAttachmentHidden} = useContext(ReportAttachmentsContext);
+    // eslint-disable-next-line es/no-nullish-coalescing-operators
+    const [isHidden, setIsHidden] = useState(isAttachmentHidden(item.reportActionID) ?? item.hasBeenFlagged);
+
+    const renderButton = (style) => (
+        <Button
+            small
+            style={style}
+            onPress={() => setIsHidden(!isHidden)}
+        >
+            <Text
+                style={styles.buttonSmallText}
+                selectable={false}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
+                {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
+            </Text>
+        </Button>
+    );
+
+    if (isHidden) {
+        const children = (
+            <>
+                <Text style={[styles.textLabelSupporting, styles.textAlignCenter, styles.lh20]}>{translate('moderation.flaggedContent')}</Text>
+                {renderButton([styles.mt2])}
+            </>
+        );
+        return onPress ? (
+            <PressableWithoutFeedback
+                style={[styles.attachmentRevealButtonContainer]}
+                onPress={onPress}
+                accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                accessibilityLabel={item.file.name || translate('attachmentView.unknownFilename')}
+            >
+                {children}
+            </PressableWithoutFeedback>
+        ) : (
+            <View style={[styles.attachmentRevealButtonContainer]}>{children}</View>
+        );
+    }
+
+    return (
+        <View style={[styles.flex1]}>
+            <View style={[styles.flex1]}>
+                <AttachmentView
+                    source={item.source}
+                    file={item.file}
+                    isAuthTokenRequired={item.isAuthTokenRequired}
+                    isFocused={isFocused}
+                    onPress={onPress}
+                    isUsedInCarousel
+                />
+            </View>
+
+            {item.hasBeenFlagged && (
+                <SafeAreaConsumer>
+                    {({safeAreaPaddingBottomStyle}) => <View style={[styles.appBG, safeAreaPaddingBottomStyle]}>{renderButton([styles.m4, styles.alignSelfCenter])}</View>}
+                </SafeAreaConsumer>
+            )}
+        </View>
+    );
+}
+
+CarouselItem.propTypes = propTypes;
+CarouselItem.defaultProps = defaultProps;
+
+export default CarouselItem;
diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
index b967d5ab0066..8a623a44709f 100644
--- a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
+++ b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
@@ -28,10 +28,12 @@ function extractAttachmentsFromReport(report, reportActions) {
             // By iterating actions in chronological order and prepending each attachment
             // we ensure correct order of attachments even across actions with multiple attachments.
             attachments.unshift({
+                reportActionID: attribs['data-id'],
                 source: tryResolveUrlFromApiRoot(expensifySource || attribs.src),
                 isAuthTokenRequired: Boolean(expensifySource),
                 file: {name: attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE]},
                 isReceipt: false,
+                hasBeenFlagged: attribs['data-flagged'] === 'true',
             });
         },
     });
@@ -57,12 +59,16 @@ function extractAttachmentsFromReport(report, reportActions) {
                     isAuthTokenRequired: true,
                     file: {name: transaction.filename},
                     isReceipt: true,
+                    transactionID,
                 });
                 return;
             }
         }
 
-        htmlParser.write(_.get(action, ['message', 0, 'html']));
+        const decision = _.get(action, ['message', 0, 'moderationDecision', 'decision'], '');
+        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
+        const html = _.get(action, ['message', 0, 'html'], '').replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
+        htmlParser.write(html);
     });
     htmlParser.end();
 
diff --git a/src/components/Attachments/AttachmentCarousel/index.js b/src/components/Attachments/AttachmentCarousel/index.js
index cec5f54508cb..574cb496d02f 100644
--- a/src/components/Attachments/AttachmentCarousel/index.js
+++ b/src/components/Attachments/AttachmentCarousel/index.js
@@ -2,10 +2,8 @@ import React, {useRef, useCallback, useState, useEffect} from 'react';
 import {View, FlatList, PixelRatio, Keyboard} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
-import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 import styles from '../../../styles/styles';
 import CarouselActions from './CarouselActions';
-import AttachmentView from '../AttachmentView';
 import withWindowDimensions from '../../withWindowDimensions';
 import CarouselButtons from './CarouselButtons';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
@@ -15,12 +13,14 @@ import withLocalize from '../../withLocalize';
 import compose from '../../../libs/compose';
 import useCarouselArrows from './useCarouselArrows';
 import useWindowDimensions from '../../../hooks/useWindowDimensions';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
 import variables from '../../../styles/variables';
+import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 
-const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 const viewabilityConfig = {
     // To facilitate paging through the attachments, we want to consider an item "viewable" when it is
     // more than 95% visible. When that happens we update the page index in the state.
@@ -31,6 +31,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     const scrollRef = useRef(null);
 
     const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
     const [containerWidth, setContainerWidth] = useState(0);
     const [page, setPage] = useState(0);
@@ -38,13 +39,25 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     const [activeSource, setActiveSource] = useState(source);
     const [shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows] = useCarouselArrows();
 
+    const compareImage = useCallback(
+        (attachment) => {
+            if (attachment.isReceipt) {
+                const action = ReportActionsUtils.getParentReportAction(report);
+                const transactionID = _.get(action, ['originalMessage', 'IOUTransactionID']);
+                return attachment.transactionID === transactionID;
+            }
+            return attachment.source === source;
+        },
+        [source, report],
+    );
+
     useEffect(() => {
         const attachmentsFromReport = extractAttachmentsFromReport(report, reportActions);
 
-        const initialPage = _.findIndex(attachmentsFromReport, (a) => a.source === source);
+        const initialPage = _.findIndex(attachmentsFromReport, compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
-        if (initialPage === -1 && _.find(attachments, (a) => a.source === source)) {
+        if (initialPage === -1 && _.find(attachments, compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
@@ -57,7 +70,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
             if (!_.isUndefined(attachmentsFromReport[initialPage])) onNavigate(attachmentsFromReport[initialPage]);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report, reportActions, source]);
+    }, [reportActions, compareImage]);
 
     /**
      * Updates the page state when the user navigates between attachments
@@ -99,7 +112,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
 
             scrollRef.current.scrollToIndex({index: nextIndex, animated: canUseTouchScreen});
         },
-        [attachments, page],
+        [attachments, canUseTouchScreen, page],
     );
 
     /**
@@ -143,24 +156,23 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     /**
      * Defines how a single attachment should be rendered
      * @param {Object} item
+     * @param {String} item.reportActionID
      * @param {Boolean} item.isAuthTokenRequired
      * @param {String} item.source
      * @param {Object} item.file
      * @param {String} item.file.name
+     * @param {Boolean} item.hasBeenFlagged
      * @returns {JSX.Element}
      */
     const renderItem = useCallback(
         ({item}) => (
-            <AttachmentView
-                source={item.source}
-                file={item.file}
-                isAuthTokenRequired={item.isAuthTokenRequired}
+            <CarouselItem
+                item={item}
                 isFocused={activeSource === item.source}
-                onPress={() => canUseTouchScreen && setShouldShowArrows(!shouldShowArrows)}
-                isUsedInCarousel
+                onPress={canUseTouchScreen ? () => setShouldShowArrows(!shouldShowArrows) : undefined}
             />
         ),
-        [activeSource, setShouldShowArrows, shouldShowArrows],
+        [activeSource, canUseTouchScreen, setShouldShowArrows, shouldShowArrows],
     );
 
     return (
diff --git a/src/components/Attachments/AttachmentCarousel/index.native.js b/src/components/Attachments/AttachmentCarousel/index.native.js
index 4162cfae88e9..a7a2f35a2ccc 100644
--- a/src/components/Attachments/AttachmentCarousel/index.native.js
+++ b/src/components/Attachments/AttachmentCarousel/index.native.js
@@ -5,17 +5,18 @@ import _ from 'underscore';
 import AttachmentCarouselPager from './Pager';
 import styles from '../../../styles/styles';
 import CarouselButtons from './CarouselButtons';
-import AttachmentView from '../AttachmentView';
 import ONYXKEYS from '../../../ONYXKEYS';
 import {propTypes, defaultProps} from './attachmentCarouselPropTypes';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
 import useCarouselArrows from './useCarouselArrows';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
 import variables from '../../../styles/variables';
 import compose from '../../../libs/compose';
 import withLocalize from '../../withLocalize';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 
 function AttachmentCarousel({report, reportActions, source, onNavigate, onClose, setDownloadButtonVisibility, translate}) {
     const pagerRef = useRef(null);
@@ -27,13 +28,25 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
     const [isPinchGestureRunning, setIsPinchGestureRunning] = useState(true);
     const [shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows] = useCarouselArrows();
 
+    const compareImage = useCallback(
+        (attachment) => {
+            if (attachment.isReceipt) {
+                const action = ReportActionsUtils.getParentReportAction(report);
+                const transactionID = _.get(action, ['originalMessage', 'IOUTransactionID']);
+                return attachment.transactionID === transactionID;
+            }
+            return attachment.source === source;
+        },
+        [source, report],
+    );
+
     useEffect(() => {
         const attachmentsFromReport = extractAttachmentsFromReport(report, reportActions);
 
-        const initialPage = _.findIndex(attachmentsFromReport, (a) => a.source === source);
+        const initialPage = _.findIndex(attachmentsFromReport, compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
-        if (initialPage === -1 && _.find(attachments, (a) => a.source === source)) {
+        if (initialPage === -1 && _.find(attachments, compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
@@ -46,7 +59,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
             if (!_.isUndefined(attachmentsFromReport[initialPage])) onNavigate(attachmentsFromReport[initialPage]);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report, reportActions, source]);
+    }, [reportActions, compareImage]);
 
     /**
      * Updates the page state when the user navigates between attachments
@@ -85,17 +98,14 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
 
     /**
      * Defines how a single attachment should be rendered
-     * @param {{ isAuthTokenRequired: Boolean, source: String, file: { name: String } }} item
+     * @param {{ reportActionID: String, isAuthTokenRequired: Boolean, source: String, file: { name: String }, hasBeenFlagged: Boolean }} item
      * @returns {JSX.Element}
      */
     const renderItem = useCallback(
         ({item}) => (
-            <AttachmentView
-                source={item.source}
-                file={item.file}
-                isAuthTokenRequired={item.isAuthTokenRequired}
+            <CarouselItem
+                item={item}
                 isFocused={activeSource === item.source}
-                isUsedInCarousel
                 onPress={() => setShouldShowArrows(!shouldShowArrows)}
             />
         ),
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
index f43a26ab94ee..64c97fa99819 100644
--- a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
@@ -2,9 +2,8 @@ import {useCallback, useEffect, useRef, useState} from 'react';
 import CONST from '../../../CONST';
 import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 
-const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
-
 function useCarouselArrows() {
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
     const [shouldShowArrows, setShouldShowArrowsInternal] = useState(canUseTouchScreen);
     const autoHideArrowTimeout = useRef(null);
 
@@ -25,7 +24,7 @@ function useCarouselArrows() {
         autoHideArrowTimeout.current = setTimeout(() => {
             setShouldShowArrowsInternal(false);
         }, CONST.ARROW_HIDE_DELAY);
-    }, [cancelAutoHideArrows]);
+    }, [canUseTouchScreen, cancelAutoHideArrows]);
 
     const setShouldShowArrows = useCallback(
         (show = true) => {
diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index aa50d6db574b..4cc70f00d1ae 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -21,8 +21,11 @@ import stylePropTypes from '../styles/stylePropTypes';
 import * as FileUtils from '../libs/fileDownload/FileUtils';
 import getImageResolution from '../libs/fileDownload/getImageResolution';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import AttachmentModal from './AttachmentModal';
 import DotIndicatorMessage from './DotIndicatorMessage';
 import * as Browser from '../libs/Browser';
+import withNavigationFocus, {withNavigationFocusPropTypes} from './withNavigationFocus';
+import compose from '../libs/compose';
 
 const propTypes = {
     /** Avatar source to display */
@@ -79,7 +82,17 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     errors: PropTypes.object,
 
+    /** Title for avatar preview modal */
+    headerTitle: PropTypes.string,
+
+    /** Avatar source for avatar preview modal */
+    previewSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+
+    /** File name of the avatar */
+    originalFileName: PropTypes.string,
+
     ...withLocalizePropTypes,
+    ...withNavigationFocusPropTypes,
 };
 
 const defaultProps = {
@@ -98,6 +111,9 @@ const defaultProps = {
     onErrorClose: () => {},
     pendingAction: null,
     errors: null,
+    headerTitle: '',
+    previewSource: '',
+    originalFileName: '',
 };
 
 class AvatarWithImagePicker extends React.Component {
@@ -129,6 +145,9 @@ class AvatarWithImagePicker extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
+        if (!prevProps.isFocused && this.props.isFocused) {
+            this.setError(null, {});
+        }
         if (!prevProps.isUploading && this.props.isUploading) {
             this.animation.start();
         } else if (prevProps.isUploading && !this.props.isUploading) {
@@ -273,58 +292,72 @@ class AvatarWithImagePicker extends React.Component {
                             </PressableWithoutFeedback>
                         </Tooltip>
                     </OfflineWithFeedback>
-                    <AttachmentPicker type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}>
-                        {({openPicker}) => {
-                            const menuItems = [
-                                {
-                                    icon: Expensicons.Upload,
-                                    text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
-                                    onSelected: () => {
-                                        if (Browser.isSafari()) {
-                                            return;
-                                        }
-                                        openPicker({
-                                            onPicked: this.showAvatarCropModal,
+                    <AttachmentModal
+                        headerTitle={this.props.headerTitle}
+                        source={this.props.previewSource}
+                        originalFileName={this.props.originalFileName}
+                    >
+                        {({show}) => (
+                            <AttachmentPicker type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}>
+                                {({openPicker}) => {
+                                    const menuItems = [
+                                        {
+                                            icon: Expensicons.Upload,
+                                            text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
+                                            onSelected: () => {
+                                                if (Browser.isSafari()) {
+                                                    return;
+                                                }
+                                                openPicker({
+                                                    onPicked: this.showAvatarCropModal,
+                                                });
+                                            },
+                                        },
+                                    ];
+
+                                    // If current avatar isn't a default avatar, allow Remove Photo option
+                                    if (!this.props.isUsingDefaultAvatar) {
+                                        menuItems.push({
+                                            icon: Expensicons.Trashcan,
+                                            text: this.props.translate('avatarWithImagePicker.removePhoto'),
+                                            onSelected: () => {
+                                                this.setError(null, {});
+                                                this.props.onImageRemoved();
+                                            },
+                                        });
+
+                                        menuItems.push({
+                                            icon: Expensicons.Eye,
+                                            text: this.props.translate('avatarWithImagePicker.viewPhoto'),
+                                            onSelected: () => show(),
                                         });
-                                    },
-                                },
-                            ];
-
-                            // If current avatar isn't a default avatar, allow Remove Photo option
-                            if (!this.props.isUsingDefaultAvatar) {
-                                menuItems.push({
-                                    icon: Expensicons.Trashcan,
-                                    text: this.props.translate('avatarWithImagePicker.removePhoto'),
-                                    onSelected: () => {
-                                        this.setError(null, {});
-                                        this.props.onImageRemoved();
-                                    },
-                                });
-                            }
-                            return (
-                                <PopoverMenu
-                                    isVisible={this.state.isMenuVisible}
-                                    onClose={() => this.setState({isMenuVisible: false})}
-                                    onItemSelected={(item, index) => {
-                                        this.setState({isMenuVisible: false});
-                                        // In order for the file picker to open dynamically, the click
-                                        // function must be called from within a event handler that was initiated
-                                        // by the user on Safari.
-                                        if (index === 0 && Browser.isSafari()) {
-                                            openPicker({
-                                                onPicked: this.showAvatarCropModal,
-                                            });
-                                        }
-                                    }}
-                                    menuItems={menuItems}
-                                    anchorPosition={this.props.anchorPosition}
-                                    withoutOverlay
-                                    anchorRef={this.anchorRef}
-                                    anchorAlignment={this.props.anchorAlignment}
-                                />
-                            );
-                        }}
-                    </AttachmentPicker>
+                                    }
+                                    return (
+                                        <PopoverMenu
+                                            isVisible={this.state.isMenuVisible}
+                                            onClose={() => this.setState({isMenuVisible: false})}
+                                            onItemSelected={(item, index) => {
+                                                this.setState({isMenuVisible: false});
+                                                // In order for the file picker to open dynamically, the click
+                                                // function must be called from within a event handler that was initiated
+                                                // by the user on Safari.
+                                                if (index === 0 && Browser.isSafari()) {
+                                                    openPicker({
+                                                        onPicked: this.showAvatarCropModal,
+                                                    });
+                                                }
+                                            }}
+                                            menuItems={menuItems}
+                                            anchorPosition={this.props.anchorPosition}
+                                            withoutOverlay
+                                            anchorRef={this.anchorRef}
+                                            anchorAlignment={this.props.anchorAlignment}
+                                        />
+                                    );
+                                }}
+                            </AttachmentPicker>
+                        )}
+                    </AttachmentModal>
                 </View>
                 {this.state.validationError && (
                     <DotIndicatorMessage
@@ -350,4 +383,4 @@ class AvatarWithImagePicker extends React.Component {
 AvatarWithImagePicker.propTypes = propTypes;
 AvatarWithImagePicker.defaultProps = defaultProps;
 
-export default withLocalize(AvatarWithImagePicker);
+export default compose(withLocalize, withNavigationFocus)(AvatarWithImagePicker);
diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index bfde528a4750..c16860344837 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -218,6 +218,7 @@ class Button extends Component {
                     this.props.icon && styles.textAlignLeft,
                     ...this.props.textStyles,
                 ]}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {this.props.text}
             </Text>
diff --git a/src/components/ButtonWithDropdownMenu.js b/src/components/ButtonWithDropdownMenu.js
index 641e65ce9d12..54d6c0deac5a 100644
--- a/src/components/ButtonWithDropdownMenu.js
+++ b/src/components/ButtonWithDropdownMenu.js
@@ -32,7 +32,7 @@ const propTypes = {
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     /** Menu options to display */
-    /** e.g. [{text: 'Pay with Expensify', icon: Wallet}, {text: 'PayPal', icon: PayPal}] */
+    /** e.g. [{text: 'Pay with Expensify', icon: Wallet}] */
     options: PropTypes.arrayOf(
         PropTypes.shape({
             value: PropTypes.string.isRequired,
@@ -108,7 +108,6 @@ function ButtonWithDropdownMenu(props) {
                         isLoading={props.isLoading}
                         shouldRemoveRightBorderRadius
                         style={[styles.flex1, styles.pr0]}
-                        pressOnEnter
                         large={isButtonSizeLarge}
                         medium={!isButtonSizeLarge}
                         innerStyles={[innerStyleDropButton]}
@@ -144,7 +143,6 @@ function ButtonWithDropdownMenu(props) {
                     isLoading={props.isLoading}
                     text={selectedItem.text}
                     onPress={(event) => props.onPress(event, props.options[0].value)}
-                    pressOnEnter
                     large={isButtonSizeLarge}
                     medium={!isButtonSizeLarge}
                     innerStyles={[innerStyleDropButton]}
diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index ccc1643021ce..b8e24c199a73 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -14,11 +14,23 @@ const propTypes = {
     /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /* Onyx Props */
+    /** Collection of recently used categories attached to a policy */
+    policyRecentlyUsedCategories: PropTypes.arrayOf(PropTypes.string),
+
+    /* Onyx Props */
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: PropTypes.shape({
+        category: PropTypes.string.isRequired,
+    }),
 };
 
 const defaultProps = {
     policyID: '',
-    policyCategories: null,
+    policyCategories: {},
+    policyRecentlyUsedCategories: [],
+    iou: {},
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index 163ab6673ca2..91c7e82e7887 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -1,47 +1,88 @@
-import React, {useMemo} from 'react';
-import _ from 'underscore';
+import React, {useMemo, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import {propTypes, defaultProps} from './categoryPickerPropTypes';
-import OptionsList from '../OptionsList';
 import styles from '../../styles/styles';
-import ScreenWrapper from '../ScreenWrapper';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import CONST from '../../CONST';
+import * as IOU from '../../libs/actions/IOU';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import OptionsSelector from '../OptionsSelector';
+import useLocalize from '../../hooks/useLocalize';
+
+function CategoryPicker({policyCategories, reportID, iouType, iou, policyRecentlyUsedCategories}) {
+    const {translate} = useLocalize();
+    const [searchValue, setSearchValue] = useState('');
+
+    const policyCategoriesCount = _.size(policyCategories);
+    const isCategoriesCountBelowThreshold = policyCategoriesCount < CONST.CATEGORY_LIST_THRESHOLD;
 
-function CategoryPicker({policyCategories, reportID, iouType}) {
-    const sections = useMemo(() => {
-        const categoryList = _.chain(policyCategories)
-            .values()
-            .map((category) => ({
-                text: category.name,
-                keyForList: category.name,
-                tooltipText: category.name,
-            }))
-            .value();
+    const selectedOptions = useMemo(() => {
+        if (!iou.category) {
+            return [];
+        }
 
         return [
             {
-                data: categoryList,
+                name: iou.category,
+                enabled: true,
+                accountID: null,
             },
         ];
-    }, [policyCategories]);
+    }, [iou.category]);
+
+    const initialFocusedIndex = useMemo(() => {
+        if (isCategoriesCountBelowThreshold && selectedOptions.length > 0) {
+            return _.chain(policyCategories)
+                .values()
+                .findIndex((category) => category.name === selectedOptions[0].name, true)
+                .value();
+        }
+
+        return 0;
+    }, [policyCategories, selectedOptions, isCategoriesCountBelowThreshold]);
+
+    const sections = useMemo(
+        () => OptionsListUtils.getNewChatOptions({}, {}, [], searchValue, selectedOptions, [], false, false, true, policyCategories, policyRecentlyUsedCategories, false).categoryOptions,
+        [policyCategories, policyRecentlyUsedCategories, searchValue, selectedOptions],
+    );
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, searchValue);
+    const shouldShowTextInput = !isCategoriesCountBelowThreshold;
 
     const navigateBack = () => {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
     };
 
+    const updateCategory = (category) => {
+        if (category.searchText === iou.category) {
+            IOU.resetMoneyRequestCategory();
+        } else {
+            IOU.setMoneyRequestCategory(category.searchText);
+        }
+
+        navigateBack();
+    };
+
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({safeAreaPaddingBottomStyle}) => (
-                <OptionsList
-                    optionHoveredStyle={styles.hoveredComponentBG}
-                    contentContainerStyles={[safeAreaPaddingBottomStyle]}
-                    sections={sections}
-                    onSelectRow={navigateBack}
-                />
-            )}
-        </ScreenWrapper>
+        <OptionsSelector
+            optionHoveredStyle={styles.hoveredComponentBG}
+            sections={sections}
+            selectedOptions={selectedOptions}
+            value={searchValue}
+            initialFocusedIndex={initialFocusedIndex}
+            headerMessage={headerMessage}
+            shouldShowTextInput={shouldShowTextInput}
+            textInputLabel={translate('common.search')}
+            boldStyle
+            highlightSelectedOptions
+            isRowMultilineSupported
+            onChangeText={setSearchValue}
+            onSelectRow={updateCategory}
+        />
     );
 }
 
@@ -53,4 +94,10 @@ export default withOnyx({
     policyCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
     },
+    policyRecentlyUsedCategories: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`,
+    },
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
 })(CategoryPicker);
diff --git a/src/components/CollapsibleSection/index.js b/src/components/CollapsibleSection/index.js
index e9c3a90a7b30..7009d1905e1d 100644
--- a/src/components/CollapsibleSection/index.js
+++ b/src/components/CollapsibleSection/index.js
@@ -51,6 +51,7 @@ class CollapsibleSection extends React.Component {
                     <Text
                         selectable={false}
                         style={[styles.flex1, styles.textStrong]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                     >
                         {this.props.title}
                     </Text>
diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js
index cbd22cc39dfd..44075a4ec1eb 100755
--- a/src/components/Composer/index.js
+++ b/src/components/Composer/index.js
@@ -83,6 +83,9 @@ const propTypes = {
     /** Whether this is the report action compose */
     isReportActionCompose: PropTypes.bool,
 
+    /** Whether the sull composer is open */
+    isComposerFullSize: PropTypes.bool,
+
     ...withLocalizePropTypes,
 
     ...windowDimensionsPropTypes,
@@ -111,6 +114,7 @@ const defaultProps = {
     shouldCalculateCaretPosition: false,
     checkComposerVisibility: () => false,
     isReportActionCompose: false,
+    isComposerFullSize: false,
 };
 
 /**
@@ -161,6 +165,7 @@ function Composer({
     checkComposerVisibility,
     selection: selectionProp,
     isReportActionCompose,
+    isComposerFullSize,
     ...props
 }) {
     const textRef = useRef(null);
@@ -413,7 +418,6 @@ function Composer({
         <View
             style={{
                 position: 'absolute',
-                bottom: -2000,
                 zIndex: -1,
                 opacity: 0,
             }}
@@ -440,9 +444,9 @@ function Composer({
             numberOfLines < maxLines ? styles.overflowHidden : {},
 
             StyleSheet.flatten([style, {outline: 'none'}]),
-            StyleUtils.getComposeTextAreaPadding(numberOfLinesProp),
+            StyleUtils.getComposeTextAreaPadding(numberOfLinesProp, isComposerFullSize),
         ],
-        [style, maxLines, numberOfLinesProp, numberOfLines],
+        [style, maxLines, numberOfLinesProp, numberOfLines, isComposerFullSize],
     );
 
     return (
diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 9a72d4e7d584..ab3e23d6b1c1 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -100,8 +100,8 @@ function ConfirmContent(props) {
                         <View style={[styles.flexRow, styles.mb3]}>
                             <Icon
                                 src={props.iconSource}
-                                width={variables.downloadAppModalAppIconSize}
-                                height={variables.downloadAppModalAppIconSize}
+                                width={variables.appModalAppIconSize}
+                                height={variables.appModalAppIconSize}
                                 additionalStyles={[...props.iconAdditionalStyles]}
                             />
                         </View>
diff --git a/src/components/ConfirmedRoute.js b/src/components/ConfirmedRoute.js
new file mode 100644
index 000000000000..dab30e60ca55
--- /dev/null
+++ b/src/components/ConfirmedRoute.js
@@ -0,0 +1,122 @@
+import React, {useEffect} from 'react';
+import PropTypes from 'prop-types';
+
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import lodashIsNil from 'lodash/isNil';
+import _ from 'underscore';
+import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
+import * as MapboxToken from '../libs/actions/MapboxToken';
+import * as TransactionUtils from '../libs/TransactionUtils';
+import * as Expensicons from './Icon/Expensicons';
+import theme from '../styles/themes/default';
+import styles from '../styles/styles';
+import transactionPropTypes from './transactionPropTypes';
+import PendingMapView from './MapView/PendingMapView';
+import useNetwork from '../hooks/useNetwork';
+import DistanceMapView from './DistanceMapView';
+
+const propTypes = {
+    /** Transaction that stores the distance request data */
+    transaction: transactionPropTypes,
+
+    /** Data about Mapbox token for calling Mapbox API */
+    mapboxAccessToken: PropTypes.shape({
+        /** Temporary token for Mapbox API */
+        token: PropTypes.string,
+
+        /** Time when the token will expire in ISO 8601 */
+        expiration: PropTypes.string,
+    }),
+};
+
+const defaultProps = {
+    transaction: {},
+    mapboxAccessToken: {
+        token: '',
+    },
+};
+
+const getWaypointMarkers = (waypoints) => {
+    const numberOfWaypoints = _.size(waypoints);
+    const lastWaypointIndex = numberOfWaypoints - 1;
+    return _.filter(
+        _.map(waypoints, (waypoint, key) => {
+            if (!waypoint || lodashIsNil(waypoint.lat) || lodashIsNil(waypoint.lng)) {
+                return;
+            }
+
+            const index = TransactionUtils.getWaypointIndex(key);
+            let MarkerComponent;
+            if (index === 0) {
+                MarkerComponent = Expensicons.DotIndicatorUnfilled;
+            } else if (index === lastWaypointIndex) {
+                MarkerComponent = Expensicons.Location;
+            } else {
+                MarkerComponent = Expensicons.DotIndicator;
+            }
+
+            return {
+                id: `${waypoint.lng},${waypoint.lat},${index}`,
+                coordinate: [waypoint.lng, waypoint.lat],
+                markerComponent: () => (
+                    <MarkerComponent
+                        width={CONST.MAP_MARKER_SIZE}
+                        height={CONST.MAP_MARKER_SIZE}
+                        fill={theme.icon}
+                    />
+                ),
+            };
+        }),
+        (waypoint) => waypoint,
+    );
+};
+
+function ConfirmedRoute({mapboxAccessToken, transaction}) {
+    const {isOffline} = useNetwork();
+    const {route0: route} = transaction.routes || {};
+    const waypoints = lodashGet(transaction, 'comment.waypoints', {});
+    const coordinates = lodashGet(route, 'geometry.coordinates', []);
+    const waypointMarkers = getWaypointMarkers(waypoints);
+
+    useEffect(() => {
+        MapboxToken.init();
+        return MapboxToken.stop;
+    }, []);
+
+    return (
+        <>
+            {!isOffline && Boolean(mapboxAccessToken.token) ? (
+                <DistanceMapView
+                    accessToken={mapboxAccessToken.token}
+                    mapPadding={CONST.MAP_PADDING}
+                    pitchEnabled={false}
+                    initialState={{
+                        zoom: CONST.MAPBOX.DEFAULT_ZOOM,
+                        location: lodashGet(waypointMarkers, [0, 'coordinate'], CONST.MAPBOX.DEFAULT_COORDINATE),
+                    }}
+                    directionCoordinates={coordinates}
+                    style={styles.mapView}
+                    waypoints={waypointMarkers}
+                    styleURL={CONST.MAPBOX.STYLE_URL}
+                />
+            ) : (
+                <PendingMapView />
+            )}
+        </>
+    );
+}
+
+export default withOnyx({
+    transaction: {
+        key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+    },
+    mapboxAccessToken: {
+        key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
+    },
+})(ConfirmedRoute);
+
+ConfirmedRoute.displayName = 'ConfirmedRoute';
+ConfirmedRoute.propTypes = propTypes;
+ConfirmedRoute.defaultProps = defaultProps;
diff --git a/src/components/CountryPicker/CountrySelectorModal.js b/src/components/CountryPicker/CountrySelectorModal.js
index 146b023bbf0c..ac543d9921d2 100644
--- a/src/components/CountryPicker/CountrySelectorModal.js
+++ b/src/components/CountryPicker/CountrySelectorModal.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React, {useMemo} from 'react';
+import React, {useMemo, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import CONST from '../../CONST';
 import useLocalize from '../../hooks/useLocalize';
@@ -40,15 +40,25 @@ const defaultProps = {
 function CountrySelectorModal({currentCountry, isVisible, onClose, onCountrySelected, setSearchValue, searchValue}) {
     const {translate} = useLocalize();
 
+    useEffect(() => {
+        if (isVisible) {
+            return;
+        }
+        setSearchValue('');
+    }, [isVisible, setSearchValue]);
+
     const countries = useMemo(
         () =>
-            _.map(translate('allCountries'), (countryName, countryISO) => ({
-                value: countryISO,
-                keyForList: countryISO,
-                text: countryName,
-                isSelected: currentCountry === countryISO,
-                searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),
-            })),
+            _.map(_.keys(CONST.ALL_COUNTRIES), (countryISO) => {
+                const countryName = translate(`allCountries.${countryISO}`);
+                return {
+                    value: countryISO,
+                    keyForList: countryISO,
+                    text: countryName,
+                    isSelected: currentCountry === countryISO,
+                    searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),
+                };
+            }),
         [translate, currentCountry],
     );
 
@@ -76,12 +86,10 @@ function CountrySelectorModal({currentCountry, isVisible, onClose, onCountrySele
                 <SelectionList
                     headerMessage={headerMessage}
                     textInputLabel={translate('common.country')}
-                    textInputPlaceholder={translate('countrySelectorModal.placeholderText')}
                     textInputValue={searchValue}
                     sections={[{data: searchResults, indexOffset: 0}]}
                     onSelectRow={onCountrySelected}
                     onChangeText={setSearchValue}
-                    shouldDelayFocus
                     initiallyFocusedOptionKey={currentCountry}
                 />
             </ScreenWrapper>
diff --git a/src/components/CountryPicker/index.js b/src/components/CountryPicker/index.js
index 684296d20b11..c838ed8f4060 100644
--- a/src/components/CountryPicker/index.js
+++ b/src/components/CountryPicker/index.js
@@ -1,7 +1,6 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import lodashGet from 'lodash/get';
 import styles from '../../styles/styles';
 import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
 import useLocalize from '../../hooks/useLocalize';
@@ -32,16 +31,10 @@ const defaultProps = {
 
 function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
     const {translate} = useLocalize();
-    const allCountries = translate('allCountries');
     const [isPickerVisible, setIsPickerVisible] = useState(false);
-    const [searchValue, setSearchValue] = useState(lodashGet(allCountries, value, ''));
-
-    useEffect(() => {
-        setSearchValue(lodashGet(allCountries, value, ''));
-    }, [value, allCountries]);
+    const [searchValue, setSearchValue] = useState('');
 
     const showPickerModal = () => {
-        setSearchValue(lodashGet(allCountries, value, ''));
         setIsPickerVisible(true);
     };
 
@@ -54,7 +47,7 @@ function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
         hidePickerModal();
     };
 
-    const title = allCountries[value] || '';
+    const title = value ? translate(`allCountries.${value}`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
diff --git a/src/components/CustomStatusBar/index.js b/src/components/CustomStatusBar/index.js
index 76752cb549e1..4848e6e35f59 100644
--- a/src/components/CustomStatusBar/index.js
+++ b/src/components/CustomStatusBar/index.js
@@ -1,11 +1,22 @@
 import React, {useEffect} from 'react';
 import StatusBar from '../../libs/StatusBar';
+import Navigation, {navigationRef} from '../../libs/Navigation/Navigation';
 import themeColors from '../../styles/themes/default';
 
 function CustomStatusBar() {
     useEffect(() => {
-        StatusBar.setBarStyle('light-content', true);
-        StatusBar.setBackgroundColor(themeColors.appBG);
+        Navigation.isNavigationReady().then(() => {
+            // Set the status bar colour depending on the current route.
+            // If we don't have any colour defined for a route, fall back to
+            // appBG color.
+            const currentRoute = navigationRef.getCurrentRoute();
+            let currentScreenBackgroundColor = themeColors.appBG;
+            if (currentRoute && 'name' in currentRoute && currentRoute.name in themeColors.PAGE_BACKGROUND_COLORS) {
+                currentScreenBackgroundColor = themeColors.PAGE_BACKGROUND_COLORS[currentRoute.name];
+            }
+            StatusBar.setBarStyle('light-content', true);
+            StatusBar.setBackgroundColor(currentScreenBackgroundColor);
+        });
     }, []);
     return <StatusBar />;
 }
diff --git a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
index e31429af61b6..61614c7e49e6 100644
--- a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
+++ b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
@@ -7,7 +7,7 @@ import Text from '../Text';
 import Icon from '../Icon';
 import * as Illustrations from '../Icon/Illustrations';
 import * as Expensicons from '../Icon/Expensicons';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
@@ -56,7 +56,7 @@ function DeeplinkRedirectLoadingIndicator({translate, openLinkInBrowser, session
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/DistanceMapView/distanceMapViewPropTypes.js b/src/components/DistanceMapView/distanceMapViewPropTypes.js
new file mode 100644
index 000000000000..05068cbc9b34
--- /dev/null
+++ b/src/components/DistanceMapView/distanceMapViewPropTypes.js
@@ -0,0 +1,55 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    // Public access token to be used to fetch map data from Mapbox.
+    accessToken: PropTypes.string.isRequired,
+
+    // Style applied to MapView component. Note some of the View Style props are not available on ViewMap
+    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
+    // Link to the style JSON document.
+    styleURL: PropTypes.string,
+
+    // Whether map can tilt in the vertical direction.
+    pitchEnabled: PropTypes.bool,
+
+    // Padding to apply when the map is adjusted to fit waypoints and directions
+    mapPadding: PropTypes.number,
+
+    // Initial coordinate and zoom level
+    initialState: PropTypes.shape({
+        location: PropTypes.arrayOf(PropTypes.number).isRequired,
+        zoom: PropTypes.number.isRequired,
+    }),
+
+    // Locations on which to put markers
+    waypoints: PropTypes.arrayOf(
+        PropTypes.shape({
+            id: PropTypes.string,
+            coordinate: PropTypes.arrayOf(PropTypes.number),
+            markerComponent: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
+        }),
+    ),
+
+    // List of coordinates which together forms a direction.
+    directionCoordinates: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
+
+    // Callback to call when the map is idle / ready
+    onMapReady: PropTypes.func,
+
+    // Optional additional styles to be applied to the overlay
+    overlayStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+};
+
+const defaultProps = {
+    styleURL: undefined,
+    pitchEnabled: false,
+    mapPadding: 0,
+    initialState: undefined,
+    waypoints: undefined,
+    directionCoordinates: undefined,
+    onMapReady: () => {},
+    overlayStyle: undefined,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/DistanceMapView/index.android.js b/src/components/DistanceMapView/index.android.js
new file mode 100644
index 000000000000..ea72fb4de299
--- /dev/null
+++ b/src/components/DistanceMapView/index.android.js
@@ -0,0 +1,48 @@
+import React, {useState} from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import BlockingView from '../BlockingViews/BlockingView';
+import MapView from '../MapView';
+import styles from '../../styles/styles';
+import useNetwork from '../../hooks/useNetwork';
+import useLocalize from '../../hooks/useLocalize';
+import * as Expensicons from '../Icon/Expensicons';
+import * as StyleUtils from '../../styles/StyleUtils';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    const [isMapReady, setIsMapReady] = useState(false);
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    return (
+        <>
+            <MapView
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {..._.omit(props, 'overlayStyle')}
+                onMapReady={() => {
+                    if (isMapReady) {
+                        return;
+                    }
+                    setIsMapReady(true);
+                }}
+            />
+            {!isMapReady && (
+                <View style={StyleUtils.combineStyles(styles.mapViewOverlay, props.overlayStyle)}>
+                    <BlockingView
+                        icon={Expensicons.EmptyStateRoutePending}
+                        title={translate('distance.mapPending.title')}
+                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                        shouldShowLink={false}
+                    />
+                </View>
+            )}
+        </>
+    );
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceMapView/index.js b/src/components/DistanceMapView/index.js
new file mode 100644
index 000000000000..24bdf99382d1
--- /dev/null
+++ b/src/components/DistanceMapView/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import _ from 'underscore';
+import MapView from '../MapView';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return <MapView {..._.omit(props, 'overlayStyle')} />;
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index ecc36a824526..966f700e25d4 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -1,41 +1,59 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useMemo, useState, useRef} from 'react';
 import {ScrollView, View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
-import _ from 'underscore';
+import lodashIsNil from 'lodash/isNil';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import MapView from 'react-native-x-maps';
+import _ from 'underscore';
+
+import CONST from '../CONST';
+import ROUTES from '../ROUTES';
 import ONYXKEYS from '../ONYXKEYS';
-import * as Transaction from '../libs/actions/Transaction';
-import * as TransactionUtils from '../libs/TransactionUtils';
-import MenuItemWithTopDescription from './MenuItemWithTopDescription';
-import * as Expensicons from './Icon/Expensicons';
-import theme from '../styles/themes/default';
-import Button from './Button';
+
 import styles from '../styles/styles';
 import variables from '../styles/variables';
-import LinearGradient from './LinearGradient';
-import * as MapboxToken from '../libs/actions/MapboxToken';
-import CONST from '../CONST';
-import BlockingView from './BlockingViews/BlockingView';
+import theme from '../styles/themes/default';
+
+import transactionPropTypes from './transactionPropTypes';
+
 import useNetwork from '../hooks/useNetwork';
+import usePrevious from '../hooks/usePrevious';
 import useLocalize from '../hooks/useLocalize';
+
+import * as ErrorUtils from '../libs/ErrorUtils';
 import Navigation from '../libs/Navigation/Navigation';
-import ROUTES from '../ROUTES';
-import transactionPropTypes from './transactionPropTypes';
+import * as MapboxToken from '../libs/actions/MapboxToken';
+import * as Transaction from '../libs/actions/Transaction';
+import * as TransactionUtils from '../libs/TransactionUtils';
+import * as IOUUtils from '../libs/IOUUtils';
+
+import Button from './Button';
+import DistanceMapView from './DistanceMapView';
+import LinearGradient from './LinearGradient';
+import * as Expensicons from './Icon/Expensicons';
+import PendingMapView from './MapView/PendingMapView';
 import DotIndicatorMessage from './DotIndicatorMessage';
-import * as ErrorUtils from '../libs/ErrorUtils';
-import usePrevious from '../hooks/usePrevious';
+import MenuItemWithTopDescription from './MenuItemWithTopDescription';
+import {iouPropTypes} from '../pages/iou/propTypes';
+import reportPropTypes from '../pages/reportPropTypes';
+import * as IOU from '../libs/actions/IOU';
+import * as StyleUtils from '../styles/StyleUtils';
+import ScreenWrapper from './ScreenWrapper';
+import FullPageNotFoundView from './BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from './HeaderWithBackButton';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
 
-const MAP_PADDING = 50;
-const DEFAULT_ZOOM_LEVEL = 10;
-
 const propTypes = {
-    /** The transactionID of this request */
-    transactionID: PropTypes.string,
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
+
+    /** Type of money request (i.e. IOU) */
+    iouType: PropTypes.oneOf(_.values(CONST.IOU.MONEY_REQUEST_TYPE)),
+
+    /** The report to which the distance request is associated */
+    report: reportPropTypes,
 
     /** The optimistic transaction for this request */
     transaction: transactionPropTypes,
@@ -48,64 +66,92 @@ const propTypes = {
         /** Time when the token will expire in ISO 8601 */
         expiration: PropTypes.string,
     }),
+
+    /** React Navigation route */
+    route: PropTypes.shape({
+        /** Params from the route */
+        params: PropTypes.shape({
+            /** The type of IOU report, i.e. bill, request, send */
+            iouType: PropTypes.string,
+
+            /** The report ID of the IOU */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
 };
 
 const defaultProps = {
-    transactionID: '',
+    iou: {},
+    iouType: '',
+    report: {},
     transaction: {},
-    mapboxAccessToken: {},
+    mapboxAccessToken: {
+        token: '',
+    },
 };
 
-function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
+function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken, route}) {
     const [shouldShowGradient, setShouldShowGradient] = useState(false);
     const [scrollContainerHeight, setScrollContainerHeight] = useState(0);
     const [scrollContentHeight, setScrollContentHeight] = useState(0);
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
 
-    const waypoints = lodashGet(transaction, 'comment.waypoints', {});
+    const isEditing = lodashGet(route, 'path', '').includes('address');
+    const reportID = lodashGet(report, 'reportID', '');
+    const waypoints = useMemo(() => lodashGet(transaction, 'comment.waypoints', {}), [transaction]);
+    const previousWaypoints = usePrevious(waypoints);
     const numberOfWaypoints = _.size(waypoints);
+    const numberOfPreviousWaypoints = _.size(previousWaypoints);
+    const scrollViewRef = useRef(null);
 
     const lastWaypointIndex = numberOfWaypoints - 1;
     const isLoadingRoute = lodashGet(transaction, 'comment.isLoading', false);
-    const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
-    const previousWaypoints = usePrevious(waypoints);
-    const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
-    const shouldFetchRoute = haveWaypointsChanged && !isOffline && !isLoadingRoute && TransactionUtils.validateWaypoints(waypoints);
-
-    const waypointMarkers = _.filter(
-        _.map(waypoints, (waypoint, key) => {
-            if (!waypoint || waypoint.lng === undefined || waypoint.lat === undefined) {
-                return;
-            }
-
-            const index = Number(key.replace('waypoint', ''));
-            let MarkerComponent;
-            if (index === 0) {
-                MarkerComponent = Expensicons.DotIndicatorUnfilled;
-            } else if (index === lastWaypointIndex) {
-                MarkerComponent = Expensicons.Location;
-            } else {
-                MarkerComponent = Expensicons.DotIndicator;
-            }
-
-            return {
-                coordinate: [waypoint.lng, waypoint.lat],
-                markerComponent: () => (
-                    <MarkerComponent
-                        width={20}
-                        height={20}
-                        fill={theme.icon}
-                    />
-                ),
-            };
-        }),
-        (waypoint) => waypoint,
+    const hasRouteError = !!lodashGet(transaction, 'errorFields.route');
+    const hasRoute = TransactionUtils.hasRoute(transaction);
+    const validatedWaypoints = TransactionUtils.getValidWaypoints(waypoints);
+    const previousValidatedWaypoints = usePrevious(validatedWaypoints);
+    const haveValidatedWaypointsChanged = !_.isEqual(previousValidatedWaypoints, validatedWaypoints);
+    const isRouteAbsentWithoutErrors = !hasRoute && !hasRouteError;
+    const shouldFetchRoute = (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && _.size(validatedWaypoints) > 1;
+    const waypointMarkers = useMemo(
+        () =>
+            _.filter(
+                _.map(waypoints, (waypoint, key) => {
+                    if (!waypoint || lodashIsNil(waypoint.lat) || lodashIsNil(waypoint.lng)) {
+                        return;
+                    }
+
+                    const index = TransactionUtils.getWaypointIndex(key);
+                    let MarkerComponent;
+                    if (index === 0) {
+                        MarkerComponent = Expensicons.DotIndicatorUnfilled;
+                    } else if (index === lastWaypointIndex) {
+                        MarkerComponent = Expensicons.Location;
+                    } else {
+                        MarkerComponent = Expensicons.DotIndicator;
+                    }
+
+                    return {
+                        id: `${waypoint.lng},${waypoint.lat},${index}`,
+                        coordinate: [waypoint.lng, waypoint.lat],
+                        markerComponent: () => (
+                            <MarkerComponent
+                                width={CONST.MAP_MARKER_SIZE}
+                                height={CONST.MAP_MARKER_SIZE}
+                                fill={theme.icon}
+                            />
+                        ),
+                    };
+                }),
+                (waypoint) => waypoint,
+            ),
+        [waypoints, lastWaypointIndex],
     );
 
     // Show up to the max number of waypoints plus 1/2 of one to hint at scrolling
-    const halfMenuItemHeight = Math.floor(variables.baseMenuItemHeight / 2);
-    const scrollContainerMaxHeight = variables.baseMenuItemHeight * MAX_WAYPOINTS_TO_DISPLAY + halfMenuItemHeight;
+    const halfMenuItemHeight = Math.floor(variables.optionRowHeight / 2);
+    const scrollContainerMaxHeight = variables.optionRowHeight * MAX_WAYPOINTS_TO_DISPLAY + halfMenuItemHeight;
 
     useEffect(() => {
         MapboxToken.init();
@@ -113,32 +159,50 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     }, []);
 
     useEffect(() => {
-        if (!transactionID || !_.isEmpty(waypoints)) {
+        if (!iou.transactionID || !_.isEmpty(waypoints)) {
             return;
         }
         // Create the initial start and stop waypoints
-        Transaction.createInitialWaypoints(transactionID);
-    }, [transactionID, waypoints]);
+        Transaction.createInitialWaypoints(iou.transactionID);
+    }, [iou.transactionID, waypoints]);
 
     const updateGradientVisibility = (event = {}) => {
         // If a waypoint extends past the bottom of the visible area show the gradient, else hide it.
         const visibleAreaEnd = lodashGet(event, 'nativeEvent.contentOffset.y', 0) + scrollContainerHeight;
         setShouldShowGradient(visibleAreaEnd < scrollContentHeight);
     };
-
-    // Handle fetching the route when there are at least 2 waypoints
     useEffect(() => {
-        if (!shouldFetchRoute) {
+        if (isOffline || !shouldFetchRoute) {
             return;
         }
 
-        Transaction.getRoute(transactionID, waypoints);
-    }, [shouldFetchRoute, transactionID, waypoints]);
+        Transaction.getRoute(iou.transactionID, validatedWaypoints);
+    }, [shouldFetchRoute, iou.transactionID, validatedWaypoints, isOffline]);
+
+    useEffect(() => {
+        if (numberOfWaypoints <= numberOfPreviousWaypoints) {
+            return;
+        }
+        scrollViewRef.current.scrollToEnd({animated: true});
+    }, [numberOfPreviousWaypoints, numberOfWaypoints]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
-    return (
-        <>
+    const navigateBack = () => {
+        Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null);
+    };
+
+    const navigateToNextPage = () => {
+        if (isEditing) {
+            Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+            return;
+        }
+
+        IOU.navigateToNextPage(iou, iouType, reportID, report);
+    };
+
+    const content = (
+        <ScrollView contentContainerStyle={styles.flexGrow1}>
             <View
                 style={styles.distanceRequestContainer(scrollContainerMaxHeight)}
                 onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))}
@@ -146,11 +210,12 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                 <ScrollView
                     onContentSizeChange={(width, height) => setScrollContentHeight(height)}
                     onScroll={updateGradientVisibility}
-                    scrollEventThrottle={16}
+                    scrollEventThrottle={variables.distanceScrollEventThrottle}
+                    ref={scrollViewRef}
                 >
                     {_.map(waypoints, (waypoint, key) => {
                         // key is of the form waypoint0, waypoint1, ...
-                        const index = Number(key.replace('waypoint', ''));
+                        const index = TransactionUtils.getWaypointIndex(key);
                         let descriptionKey = 'distance.waypointDescription.';
                         let waypointIcon;
                         if (index === 0) {
@@ -168,7 +233,6 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             <MenuItemWithTopDescription
                                 description={translate(descriptionKey)}
                                 title={lodashGet(waypoints, [`waypoint${index}`, 'address'], '')}
-                                icon={Expensicons.DragHandles}
                                 iconFill={theme.icon}
                                 secondaryIcon={waypointIcon}
                                 secondaryIconFill={theme.icon}
@@ -182,7 +246,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                 {shouldShowGradient && (
                     <LinearGradient
                         style={[styles.pAbsolute, styles.b0, styles.l0, styles.r0, {height: halfMenuItemHeight}]}
-                        colors={[theme.transparent, theme.modalBackground]}
+                        colors={[StyleUtils.getTransparentColor(theme.modalBackground), theme.modalBackground]}
                     />
                 )}
                 {hasRouteError && (
@@ -197,7 +261,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                 <Button
                     small
                     icon={Expensicons.Plus}
-                    onPress={() => Transaction.addStop(transactionID)}
+                    onPress={() => Transaction.addStop(iou.transactionID)}
                     text={translate('distance.addStop')}
                     isDisabled={numberOfWaypoints === MAX_WAYPOINTS}
                     innerStyles={[styles.ph10]}
@@ -205,32 +269,58 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
             </View>
             <View style={styles.mapViewContainer}>
                 {!isOffline && Boolean(mapboxAccessToken.token) ? (
-                    <MapView
+                    <DistanceMapView
                         accessToken={mapboxAccessToken.token}
-                        mapPadding={MAP_PADDING}
+                        mapPadding={CONST.MAPBOX.PADDING}
                         pitchEnabled={false}
                         initialState={{
-                            location: CONST.SF_COORDINATES,
-                            zoom: DEFAULT_ZOOM_LEVEL,
+                            zoom: CONST.MAPBOX.DEFAULT_ZOOM,
+                            location: CONST.MAPBOX.DEFAULT_COORDINATE,
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
-                        directionStyle={styles.mapDirection}
                         style={styles.mapView}
                         waypoints={waypointMarkers}
-                        styleURL={CONST.MAPBOX_STYLE_URL}
+                        styleURL={CONST.MAPBOX.STYLE_URL}
+                        overlayStyle={styles.m4}
                     />
                 ) : (
-                    <View style={[styles.mapPendingView]}>
-                        <BlockingView
-                            icon={Expensicons.EmptyStateRoutePending}
-                            title={translate('distance.mapPending.title')}
-                            subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
-                            shouldShowLink={false}
-                        />
-                    </View>
+                    <PendingMapView
+                        title={translate('distance.mapPending.title')}
+                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                    />
                 )}
             </View>
-        </>
+            <Button
+                success
+                style={[styles.w100, styles.mb4, styles.ph4, styles.flexShrink0]}
+                onPress={navigateToNextPage}
+                isDisabled={_.size(validatedWaypoints) < 2 || hasRouteError || isOffline}
+                text={translate('common.next')}
+            />
+        </ScrollView>
+    );
+
+    if (!isEditing) {
+        return content;
+    }
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableKeyboardAvoidingView={false}
+        >
+            {({safeAreaPaddingBottomStyle}) => (
+                <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType)}>
+                    <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
+                        <HeaderWithBackButton
+                            title={translate('common.distance')}
+                            onBackButonBackButtonPress={navigateBack}
+                        />
+                        {content}
+                    </View>
+                </FullPageNotFoundView>
+            )}
+        </ScreenWrapper>
     );
 }
 
@@ -239,7 +329,7 @@ DistanceRequest.propTypes = propTypes;
 DistanceRequest.defaultProps = defaultProps;
 export default withOnyx({
     transaction: {
-        key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.transactionID}`,
+        key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.iou.transactionID}`,
     },
     mapboxAccessToken: {
         key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
diff --git a/src/components/DotIndicatorMessage.js b/src/components/DotIndicatorMessage.js
index ac550f34de3f..b3528b43dc75 100644
--- a/src/components/DotIndicatorMessage.js
+++ b/src/components/DotIndicatorMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import styles from '../styles/styles';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Text from './Text';
 import * as Localize from '../libs/Localize';
 
@@ -57,7 +57,7 @@ function DotIndicatorMessage(props) {
             <View style={styles.offlineFeedback.errorDot}>
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={props.type === 'error' ? colors.red : colors.green}
+                    fill={props.type === 'error' ? themeColors.danger : themeColors.success}
                 />
             </View>
             <View style={styles.offlineFeedback.textContainer}>
diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
deleted file mode 100644
index ffa933708e4c..000000000000
--- a/src/components/DownloadAppModal.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, {useState} from 'react';
-import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
-import styles from '../styles/styles';
-import CONST from '../CONST';
-import AppIcon from '../../assets/images/expensify-app-icon.svg';
-import useLocalize from '../hooks/useLocalize';
-import * as Link from '../libs/actions/Link';
-import * as Browser from '../libs/Browser';
-import getOperatingSystem from '../libs/getOperatingSystem';
-import setShowDownloadAppModal from '../libs/actions/DownloadAppModal';
-import ConfirmModal from './ConfirmModal';
-
-const propTypes = {
-    /** ONYX PROP to hide banner for a user that has dismissed it */
-    // eslint-disable-next-line react/forbid-prop-types
-    showDownloadAppBanner: PropTypes.bool,
-
-    /** Whether the user is logged in */
-    isAuthenticated: PropTypes.bool.isRequired,
-};
-
-const defaultProps = {
-    showDownloadAppBanner: true,
-};
-
-function DownloadAppModal({isAuthenticated, showDownloadAppBanner}) {
-    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() && isAuthenticated && showDownloadAppBanner);
-
-    const {translate} = useLocalize();
-
-    const handleCloseBanner = () => {
-        setShowDownloadAppModal(false);
-        setshouldShowBanner(false);
-    };
-
-    let link = '';
-
-    if (getOperatingSystem() === CONST.OS.IOS) {
-        link = CONST.APP_DOWNLOAD_LINKS.IOS;
-    } else if (getOperatingSystem() === CONST.OS.ANDROID) {
-        link = CONST.APP_DOWNLOAD_LINKS.ANDROID;
-    }
-
-    const handleOpenAppStore = () => {
-        Link.openExternalLink(link, true);
-    };
-
-    return (
-        <ConfirmModal
-            title={translate('DownloadAppModal.downloadTheApp')}
-            isVisible={shouldShowBanner}
-            onConfirm={handleOpenAppStore}
-            onCancel={handleCloseBanner}
-            prompt={translate('DownloadAppModal.keepTheConversationGoing')}
-            confirmText={translate('common.download')}
-            cancelText={translate('DownloadAppModal.noThanks')}
-            shouldCenterContent
-            iconSource={AppIcon}
-            promptStyles={[styles.textNormal, styles.lh20]}
-            titleStyles={[styles.textHeadline]}
-            iconAdditionalStyles={[styles.appIconBorderRadius]}
-            shouldStackButtons={false}
-        />
-    );
-}
-
-DownloadAppModal.displayName = 'DownloadAppModal';
-DownloadAppModal.propTypes = propTypes;
-DownloadAppModal.defaultProps = defaultProps;
-
-export default withOnyx({
-    showDownloadAppBanner: {
-        key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-    },
-})(DownloadAppModal);
diff --git a/src/components/DragAndDrop/Provider/dragAndDropProviderPropTypes.js b/src/components/DragAndDrop/Provider/dragAndDropProviderPropTypes.js
index d9cc806e9012..82e503456f7d 100644
--- a/src/components/DragAndDrop/Provider/dragAndDropProviderPropTypes.js
+++ b/src/components/DragAndDrop/Provider/dragAndDropProviderPropTypes.js
@@ -6,4 +6,7 @@ export default {
 
     /** Should this dropZone be disabled? */
     isDisabled: PropTypes.bool,
+
+    /** Indicate that users are dragging file or not */
+    setIsDraggingOver: PropTypes.func,
 };
diff --git a/src/components/DragAndDrop/Provider/index.js b/src/components/DragAndDrop/Provider/index.js
index 89b0f47a830d..6408f6dbfbfa 100644
--- a/src/components/DragAndDrop/Provider/index.js
+++ b/src/components/DragAndDrop/Provider/index.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React, {useRef, useCallback} from 'react';
+import React, {useRef, useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 import {PortalHost} from '@gorhom/portal';
 import Str from 'expensify-common/lib/str';
@@ -17,7 +17,7 @@ function shouldAcceptDrop(event) {
     return _.some(event.dataTransfer.types, (type) => type === 'Files');
 }
 
-function DragAndDropProvider({children, isDisabled = false}) {
+function DragAndDropProvider({children, isDisabled = false, setIsDraggingOver = () => {}}) {
     const dropZone = useRef(null);
     const dropZoneID = useRef(Str.guid('drag-n-drop'));
 
@@ -33,6 +33,10 @@ function DragAndDropProvider({children, isDisabled = false}) {
         isDisabled,
     });
 
+    useEffect(() => {
+        setIsDraggingOver(isDraggingOver);
+    }, [isDraggingOver, setIsDraggingOver]);
+
     return (
         <DragAndDropContext.Provider value={{isDraggingOver, setOnDropHandler, dropZoneID: dropZoneID.current}}>
             <View
diff --git a/src/components/EmojiPicker/EmojiPicker.js b/src/components/EmojiPicker/EmojiPicker.js
index 40d91ff03267..a12b089ddf97 100644
--- a/src/components/EmojiPicker/EmojiPicker.js
+++ b/src/components/EmojiPicker/EmojiPicker.js
@@ -114,9 +114,11 @@ const EmojiPicker = forwardRef((props, ref) => {
      */
     const isActive = (id) => Boolean(id) && id === activeID;
 
+    const clearActive = () => setActiveID(null);
+
     const resetEmojiPopoverAnchor = () => (emojiPopoverAnchor.current = null);
 
-    useImperativeHandle(ref, () => ({showEmojiPicker, isActive, hideEmojiPicker, isEmojiPickerVisible, resetEmojiPopoverAnchor}));
+    useImperativeHandle(ref, () => ({showEmojiPicker, isActive, clearActive, hideEmojiPicker, isEmojiPickerVisible, resetEmojiPopoverAnchor}));
 
     useEffect(() => {
         const emojiPopoverDimensionListener = Dimensions.addEventListener('change', () => {
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index 6e2856a7e058..d3268ebc54b0 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -21,7 +21,6 @@ import * as EmojiUtils from '../../../libs/EmojiUtils';
 import CategoryShortcutBar from '../CategoryShortcutBar';
 import TextInput from '../../TextInput';
 import isEnterWhileComposition from '../../../libs/KeyboardShortcut/isEnterWhileComposition';
-import canFocusInputOnScreenFocus from '../../../libs/canFocusInputOnScreenFocus';
 
 const propTypes = {
     /** Function to add the selected emoji to the main compose text input */
@@ -59,13 +58,8 @@ class EmojiPickerMenu extends Component {
         // Ref for emoji FlatList
         this.emojiList = undefined;
 
-        // We want consistent auto focus behavior on input between native and mWeb so we have some auto focus management code that will
-        // prevent auto focus when open picker for mobile device
-        this.shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus();
-
         this.filterEmojis = _.debounce(this.filterEmojis.bind(this), 300);
         this.highlightAdjacentEmoji = this.highlightAdjacentEmoji.bind(this);
-        this.scrollToHighlightedIndex = this.scrollToHighlightedIndex.bind(this);
         this.setupEventHandlers = this.setupEventHandlers.bind(this);
         this.cleanupEventHandlers = this.cleanupEventHandlers.bind(this);
         this.renderItem = this.renderItem.bind(this);
@@ -76,7 +70,6 @@ class EmojiPickerMenu extends Component {
         this.getItemLayout = this.getItemLayout.bind(this);
         this.scrollToHeader = this.scrollToHeader.bind(this);
 
-        this.currentScrollOffset = 0;
         this.firstNonHeaderIndex = 0;
 
         const {filteredEmojis, headerEmojis, headerRowIndices} = this.getEmojisAndHeaderRowIndices();
@@ -103,7 +96,7 @@ class EmojiPickerMenu extends Component {
         // get a ref to the inner textInput element e.g. if we do
         // <constructor ref={el => this.textInput = el} /> this will not
         // return a ref to the component, but rather the HTML element by default
-        if (this.shouldFocusInputOnScreenFocus && this.props.forwardedRef && _.isFunction(this.props.forwardedRef)) {
+        if (this.props.forwardedRef && _.isFunction(this.props.forwardedRef)) {
             this.props.forwardedRef(this.searchInput);
         }
         this.setupEventHandlers();
@@ -299,9 +292,9 @@ class EmojiPickerMenu extends Component {
                 return;
             }
 
-            // Blur the input and change the highlight type to keyboard
+            // Blur the input, change the highlight type to keyboard, and disable pointer events
             this.searchInput.blur();
-            this.setState({isUsingKeyboardMovement: true});
+            this.setState({isUsingKeyboardMovement: true, arePointerEventsDisabled: true});
 
             // We only want to hightlight the Emoji if none was highlighted already
             // If we already have a highlighted Emoji, lets just skip the first navigation
@@ -311,10 +304,9 @@ class EmojiPickerMenu extends Component {
         }
 
         // If nothing is highlighted and an arrow key is pressed
-        // select the first emoji
+        // select the first emoji, apply keyboard movement styles, and disable pointer events
         if (this.state.highlightedIndex === -1) {
-            this.setState({highlightedIndex: this.firstNonHeaderIndex});
-            this.scrollToHighlightedIndex();
+            this.setState({highlightedIndex: this.firstNonHeaderIndex, isUsingKeyboardMovement: true, arePointerEventsDisabled: true});
             return;
         }
 
@@ -368,10 +360,9 @@ class EmojiPickerMenu extends Component {
                 break;
         }
 
-        // Actually highlight the new emoji, apply keyboard movement styles, and scroll to it if the index was changed
+        // Actually highlight the new emoji, apply keyboard movement styles, and disable pointer events
         if (newIndex !== this.state.highlightedIndex) {
-            this.setState({highlightedIndex: newIndex, isUsingKeyboardMovement: true});
-            this.scrollToHighlightedIndex();
+            this.setState({highlightedIndex: newIndex, isUsingKeyboardMovement: true, arePointerEventsDisabled: true});
         }
     }
 
@@ -381,36 +372,6 @@ class EmojiPickerMenu extends Component {
         this.emojiList.scrollToOffset({offset: calculatedOffset, animated: true});
     }
 
-    /**
-     * Calculates the required scroll offset (aka distance from top) and scrolls the FlatList to the highlighted emoji
-     * if any portion of it falls outside of the window.
-     * Doing this because scrollToIndex doesn't work as expected.
-     */
-    scrollToHighlightedIndex() {
-        // Calculate the number of rows above the current row, then add 1 to include the current row
-        const numRows = Math.floor(this.state.highlightedIndex / CONST.EMOJI_NUM_PER_ROW) + 1;
-
-        // The scroll offsets at the top and bottom of the highlighted emoji
-        const offsetAtEmojiBottom = numRows * CONST.EMOJI_PICKER_HEADER_HEIGHT;
-        const offsetAtEmojiTop = offsetAtEmojiBottom - CONST.EMOJI_PICKER_ITEM_HEIGHT;
-
-        // Scroll to fit the entire highlighted emoji into the window if we need to
-        let targetOffset = this.currentScrollOffset;
-        if (offsetAtEmojiBottom - this.currentScrollOffset >= CONST.NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT) {
-            targetOffset = offsetAtEmojiBottom - CONST.NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT;
-        } else if (offsetAtEmojiTop - CONST.EMOJI_PICKER_HEADER_HEIGHT <= this.currentScrollOffset) {
-            // There is always a sticky header on the top, subtract the EMOJI_PICKER_HEADER_HEIGHT from offsetAtEmojiTop to get the correct scroll position.
-            targetOffset = offsetAtEmojiTop - CONST.EMOJI_PICKER_HEADER_HEIGHT;
-        }
-        if (targetOffset !== this.currentScrollOffset) {
-            // Disable pointer events so that onHover doesn't get triggered when the items move while we're scrolling
-            if (!this.state.arePointerEventsDisabled) {
-                this.setState({arePointerEventsDisabled: true});
-            }
-            this.emojiList.scrollToOffset({offset: targetOffset, animated: false});
-        }
-    }
-
     /**
      * Filter the entire list of emojis to only emojis that have the search term in their keywords
      *
@@ -530,6 +491,7 @@ class EmojiPickerMenu extends Component {
         return (
             <View
                 style={[styles.emojiPickerContainer, StyleUtils.getEmojiPickerStyle(this.props.isSmallScreenWidth)]}
+                // Disable pointer events so that onHover doesn't get triggered when the items move while we're scrolling
                 pointerEvents={this.state.arePointerEventsDisabled ? 'none' : 'auto'}
             >
                 <View style={[styles.ph4, styles.pb3, styles.pt2]}>
@@ -540,7 +502,6 @@ class EmojiPickerMenu extends Component {
                         onChangeText={this.filterEmojis}
                         defaultValue=""
                         ref={(el) => (this.searchInput = el)}
-                        autoFocus={this.shouldFocusInputOnScreenFocus}
                         selectTextOnFocus={this.state.selectTextOnFocus}
                         onSelectionChange={this.onSelectionChange}
                         onFocus={() => this.setState({isFocused: true, highlightedIndex: -1, isUsingKeyboardMovement: false})}
@@ -566,10 +527,11 @@ class EmojiPickerMenu extends Component {
                         {overscrollBehaviorY: 'contain'},
                         // Set overflow to hidden to prevent elastic scrolling when there are not enough contents to scroll in FlatList
                         {overflowY: this.state.filteredEmojis.length > overflowLimit ? 'auto' : 'hidden'},
+                        // Set scrollPaddingTop to consider sticky headers while scrolling
+                        {scrollPaddingTop: isFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT},
                     ]}
                     extraData={[this.state.filteredEmojis, this.state.highlightedIndex, this.props.preferredSkinTone]}
                     stickyHeaderIndices={this.state.headerIndices}
-                    onScroll={(e) => (this.currentScrollOffset = e.nativeEvent.contentOffset.y)}
                     getItemLayout={this.getItemLayout}
                     contentContainerStyle={styles.flexGrow1}
                     ListEmptyComponent={<Text style={[styles.textLabel, styles.colorMuted]}>{this.props.translate('common.noResultsFound')}</Text>}
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
index a794d4aa4bad..5cd956dae56b 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
@@ -19,11 +19,15 @@ import * as User from '../../../libs/actions/User';
 import TextInput from '../../TextInput';
 import CategoryShortcutBar from '../CategoryShortcutBar';
 import * as StyleUtils from '../../../styles/StyleUtils';
+import useSingleExecution from '../../../hooks/useSingleExecution';
 
 const propTypes = {
     /** Function to add the selected emoji to the main compose text input */
     onEmojiSelected: PropTypes.func.isRequired,
 
+    /** The ref to the search input (may be null on small screen widths) */
+    forwardedRef: PropTypes.func,
+
     /** Stores user's preferred skin tone */
     preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 
@@ -36,11 +40,12 @@ const propTypes = {
 };
 
 const defaultProps = {
+    forwardedRef: () => {},
     preferredSkinTone: CONST.EMOJI_DEFAULT_SKIN_TONE,
     frequentlyUsedEmojis: [],
 };
 
-function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, translate, frequentlyUsedEmojis}) {
+function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, translate, frequentlyUsedEmojis, forwardedRef}) {
     const emojiList = useAnimatedRef();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const allEmojis = useMemo(() => EmojiUtils.mergeEmojisWithFrequentlyUsedEmojis(emojis), [frequentlyUsedEmojis]);
@@ -49,6 +54,7 @@ function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, t
     const [filteredEmojis, setFilteredEmojis] = useState(allEmojis);
     const [headerIndices, setHeaderIndices] = useState(headerRowIndices);
     const {windowWidth} = useWindowDimensions();
+    const {singleExecution} = useSingleExecution();
 
     useEffect(() => {
         setFilteredEmojis(allEmojis);
@@ -150,7 +156,7 @@ function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, t
 
         return (
             <EmojiPickerMenuItem
-                onPress={(emoji) => addToFrequentAndSelectEmoji(emoji, item)}
+                onPress={singleExecution((emoji) => addToFrequentAndSelectEmoji(emoji, item))}
                 emoji={emojiCode}
             />
         );
@@ -166,6 +172,7 @@ function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, t
                     accessibilityLabel={translate('common.search')}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                     onChangeText={filterEmojis}
+                    ref={forwardedRef}
                 />
             </View>
             {!isFiltered && (
diff --git a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
index 37e90f01c707..b51a8b07537c 100644
--- a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
@@ -42,13 +42,14 @@ class EmojiPickerMenuItem extends PureComponent {
         super(props);
 
         this.ref = null;
+        this.focusAndScroll = this.focusAndScroll.bind(this);
     }
 
     componentDidMount() {
         if (!this.props.isFocused) {
             return;
         }
-        this.ref.focus();
+        this.focusAndScroll();
     }
 
     componentDidUpdate(prevProps) {
@@ -58,7 +59,12 @@ class EmojiPickerMenuItem extends PureComponent {
         if (!this.props.isFocused) {
             return;
         }
-        this.ref.focus();
+        this.focusAndScroll();
+    }
+
+    focusAndScroll() {
+        this.ref.focus({preventScroll: true});
+        this.ref.scrollIntoView({block: 'nearest'});
     }
 
     render() {
@@ -66,15 +72,16 @@ class EmojiPickerMenuItem extends PureComponent {
             <PressableWithoutFeedback
                 shouldUseAutoHitSlop={false}
                 onPress={() => this.props.onPress(this.props.emoji)}
+                onPressOut={Browser.isMobile() ? this.props.onHoverOut : undefined}
                 onHoverIn={this.props.onHoverIn}
                 onHoverOut={this.props.onHoverOut}
                 onFocus={this.props.onFocus}
                 onBlur={this.props.onBlur}
                 ref={(ref) => (this.ref = ref)}
                 style={({pressed}) => [
-                    Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)),
                     this.props.isHighlighted && this.props.isUsingKeyboardMovement ? styles.emojiItemKeyboardHighlighted : {},
                     this.props.isHighlighted && !this.props.isUsingKeyboardMovement ? styles.emojiItemHighlighted : {},
+                    Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)),
                     styles.emojiItem,
                 ]}
                 accessibilityLabel={this.props.emoji}
diff --git a/src/components/ErrorBoundary/BaseErrorBoundary.js b/src/components/ErrorBoundary/BaseErrorBoundary.js
index e479b04f7ade..d626442e81dd 100644
--- a/src/components/ErrorBoundary/BaseErrorBoundary.js
+++ b/src/components/ErrorBoundary/BaseErrorBoundary.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import {ErrorBoundary} from 'react-error-boundary';
 import BootSplash from '../../libs/BootSplash';
 import GenericErrorPage from '../../pages/ErrorPage/GenericErrorPage';
 
@@ -22,40 +23,27 @@ const defaultProps = {
  * This component captures an error in the child component tree and logs it to the server
  * It can be used to wrap the entire app as well as to wrap specific parts for more granularity
  * @see {@link https://reactjs.org/docs/error-boundaries.html#where-to-place-error-boundaries}
+ * @return {React.Component}
  */
-class BaseErrorBoundary extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {hasError: false};
-        this.clearError = this.clearError.bind(this);
-    }
-
-    static getDerivedStateFromError() {
-        // Update state so the next render will show the fallback UI.
-        return {hasError: true};
-    }
-
-    componentDidCatch(error, errorInfo) {
-        this.props.logError(this.props.errorMessage, error, JSON.stringify(errorInfo));
-
+function BaseErrorBoundary({logError, errorMessage, children}) {
+    const catchError = (error, errorInfo) => {
+        logError(errorMessage, error, JSON.stringify(errorInfo));
         // We hide the splash screen since the error might happened during app init
         BootSplash.hide();
-    }
-
-    clearError() {
-        this.setState({hasError: false});
-    }
-
-    render() {
-        if (this.state.hasError) {
-            return <GenericErrorPage onRefresh={this.clearError} />;
-        }
-
-        return this.props.children;
-    }
+    };
+
+    return (
+        <ErrorBoundary
+            fallback={<GenericErrorPage />}
+            onError={catchError}
+        >
+            {children}
+        </ErrorBoundary>
+    );
 }
 
 BaseErrorBoundary.propTypes = propTypes;
 BaseErrorBoundary.defaultProps = defaultProps;
+BaseErrorBoundary.displayName = 'BaseErrorBoundary';
 
 export default BaseErrorBoundary;
diff --git a/src/components/Form.js b/src/components/Form.js
index eb6945f6ec78..ef6c3ea10474 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -108,16 +108,19 @@ function Form(props) {
     const formContentRef = useRef(null);
     const inputRefs = useRef({});
     const touchedInputs = useRef({});
+    const focusedInput = useRef(null);
     const isFirstRender = useRef(true);
 
     const {validate, onSubmit, children} = props;
 
+    const hasServerError = useMemo(() => Boolean(props.formState) && !_.isEmpty(props.formState.errors), [props.formState]);
+
     /**
      * @param {Object} values - An object containing the value of each inputID, e.g. {inputID1: value1, inputID2: value2}
      * @returns {Object} - An object containing the errors for each inputID, e.g. {inputID1: error1, inputID2: error2}
      */
     const onValidate = useCallback(
-        (values) => {
+        (values, shouldClearServerError = true) => {
             const trimmedStringValues = {};
             _.each(values, (inputValue, inputID) => {
                 if (_.isString(inputValue)) {
@@ -127,7 +130,9 @@ function Form(props) {
                 }
             });
 
-            FormActions.setErrors(props.formID, null);
+            if (shouldClearServerError) {
+                FormActions.setErrors(props.formID, null);
+            }
             FormActions.setErrorFields(props.formID, null);
 
             // Run any validations passed as a prop
@@ -135,8 +140,33 @@ function Form(props) {
 
             // Validate the input for html tags. It should supercede any other error
             _.each(trimmedStringValues, (inputValue, inputID) => {
-                // Return early if there is no value OR the value is not a string OR there are no HTML characters
-                if (!inputValue || !_.isString(inputValue) || inputValue.search(CONST.VALIDATE_FOR_HTML_TAG_REGEX) === -1) {
+                // If the input value is empty OR is non-string, we don't need to validate it for HTML tags
+                if (!inputValue || !_.isString(inputValue)) {
+                    return;
+                }
+                const foundHtmlTagIndex = inputValue.search(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
+                const leadingSpaceIndex = inputValue.search(CONST.VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX);
+
+                // Return early if there are no HTML characters
+                if (leadingSpaceIndex === -1 && foundHtmlTagIndex === -1) {
+                    return;
+                }
+
+                const matchedHtmlTags = inputValue.match(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
+                let isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(inputValue));
+                // Check for any matches that the original regex (foundHtmlTagIndex) matched
+                if (matchedHtmlTags) {
+                    // Check if any matched inputs does not match in WHITELISTED_TAGS list and return early if needed.
+                    for (let i = 0; i < matchedHtmlTags.length; i++) {
+                        const htmlTag = matchedHtmlTags[i];
+                        isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(htmlTag));
+                        if (!isMatch) {
+                            break;
+                        }
+                    }
+                }
+
+                if (isMatch && leadingSpaceIndex === -1) {
                     return;
                 }
 
@@ -305,6 +335,12 @@ function Form(props) {
                     // as this is already happening by the value prop.
                     defaultValue: undefined,
                     errorText: errors[inputID] || fieldErrorMessage,
+                    onFocus: (event) => {
+                        focusedInput.current = inputID;
+                        if (_.isFunction(child.props.onFocus)) {
+                            child.props.onFocus(event);
+                        }
+                    },
                     onBlur: (event) => {
                         // Only run validation when user proactively blurs the input.
                         if (Visibility.isVisible() && Visibility.hasFocus()) {
@@ -314,7 +350,7 @@ function Form(props) {
                             setTimeout(() => {
                                 setTouchedInput(inputID);
                                 if (props.shouldValidateOnBlur) {
-                                    onValidate(inputValues);
+                                    onValidate(inputValues, !hasServerError);
                                 }
                             }, 200);
                         }
@@ -328,6 +364,11 @@ function Form(props) {
                     },
                     onInputChange: (value, key) => {
                         const inputKey = key || inputID;
+
+                        if (focusedInput.current && focusedInput.current !== inputKey) {
+                            setTouchedInput(focusedInput.current);
+                        }
+
                         setInputValues((prevState) => {
                             const newState = {
                                 ...prevState,
@@ -353,7 +394,19 @@ function Form(props) {
 
             return childrenElements;
         },
-        [errors, inputRefs, inputValues, onValidate, props.draftValues, props.formID, props.formState, setTouchedInput, props.shouldValidateOnBlur, props.shouldValidateOnChange],
+        [
+            errors,
+            inputRefs,
+            inputValues,
+            onValidate,
+            props.draftValues,
+            props.formID,
+            props.formState,
+            setTouchedInput,
+            props.shouldValidateOnBlur,
+            props.shouldValidateOnChange,
+            hasServerError,
+        ],
     );
 
     const scrollViewContent = useCallback(
diff --git a/src/components/FormAlertWithSubmitButton.js b/src/components/FormAlertWithSubmitButton.js
index 9c941fa9b967..33d188719d11 100644
--- a/src/components/FormAlertWithSubmitButton.js
+++ b/src/components/FormAlertWithSubmitButton.js
@@ -46,6 +46,10 @@ const propTypes = {
 
     /** Custom content to display in the footer after submit button */
     footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
+
+    /** Styles for the button */
+    // eslint-disable-next-line react/forbid-prop-types
+    buttonStyles: PropTypes.arrayOf(PropTypes.object),
 };
 
 const defaultProps = {
@@ -59,10 +63,11 @@ const defaultProps = {
     disablePressOnEnter: false,
     isSubmitActionDangerous: false,
     footerContent: null,
+    buttonStyles: [],
 };
 
 function FormAlertWithSubmitButton(props) {
-    const buttonMarginStyle = _.isEmpty(props.footerContent) ? {} : styles.mb3;
+    const buttonStyles = [_.isEmpty(props.footerContent) ? {} : styles.mb3, ...props.buttonStyles];
 
     return (
         <FormAlertWrapper
@@ -79,7 +84,7 @@ function FormAlertWithSubmitButton(props) {
                             success
                             isDisabled
                             text={props.buttonText}
-                            style={buttonMarginStyle}
+                            style={buttonStyles}
                             danger={props.isSubmitActionDangerous}
                         />
                     ) : (
@@ -87,7 +92,7 @@ function FormAlertWithSubmitButton(props) {
                             success
                             pressOnEnter={!props.disablePressOnEnter}
                             text={props.buttonText}
-                            style={buttonMarginStyle}
+                            style={buttonStyles}
                             onPress={props.onSubmit}
                             isDisabled={props.isDisabled}
                             isLoading={props.isLoading}
diff --git a/src/components/FormHelpMessage.js b/src/components/FormHelpMessage.js
index df8befe5af30..f7366f8dfef6 100644
--- a/src/components/FormHelpMessage.js
+++ b/src/components/FormHelpMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import styles from '../styles/styles';
 import stylePropTypes from '../styles/stylePropTypes';
 import * as Localize from '../libs/Localize';
@@ -42,7 +42,7 @@ function FormHelpMessage(props) {
             {props.isError && (
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={colors.red}
+                    fill={themeColors.danger}
                 />
             )}
             <View style={[styles.flex1, props.isError && styles.ml2]}>
diff --git a/src/components/GrowlNotification/index.js b/src/components/GrowlNotification/index.js
index 60bd1bf00587..a06185ac3320 100644
--- a/src/components/GrowlNotification/index.js
+++ b/src/components/GrowlNotification/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import {Directions, FlingGestureHandler, State} from 'react-native-gesture-handler';
 import {View, Animated} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import Text from '../Text';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
@@ -10,19 +10,20 @@ import GrowlNotificationContainer from './GrowlNotificationContainer';
 import CONST from '../../CONST';
 import * as Growl from '../../libs/Growl';
 import * as Pressables from '../Pressable';
+import useNativeDriver from '../../libs/useNativeDriver';
 
 const types = {
     [CONST.GROWL.SUCCESS]: {
         icon: Expensicons.Checkmark,
-        iconColor: colors.green,
+        iconColor: themeColors.success,
     },
     [CONST.GROWL.ERROR]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.red,
+        iconColor: themeColors.danger,
     },
     [CONST.GROWL.WARNING]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.yellow,
+        iconColor: themeColors.warning,
     },
 };
 
@@ -59,7 +60,7 @@ function GrowlNotification(_, ref) {
             Animated.spring(translateY, {
                 toValue: val,
                 duration: 80,
-                useNativeDriver: true,
+                useNativeDriver,
             }).start();
         },
         [translateY],
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
index 5417f7af6820..4b61d55ae228 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -6,6 +6,7 @@ import htmlRenderers from './HTMLRenderers';
 import * as HTMLEngineUtils from './htmlEngineUtils';
 import styles from '../../styles/styles';
 import fontFamily from '../../styles/fontFamily';
+import convertToLTR from '../../libs/convertToLTR';
 
 const propTypes = {
     /** Whether text elements should be selectable */
@@ -71,6 +72,10 @@ function BaseHTMLEngineProvider(props) {
             enableCSSInlineProcessing={false}
             systemFonts={_.values(fontFamily)}
             fallbackFonts={fallbackFonts}
+            domVisitors={{
+                // eslint-disable-next-line no-param-reassign
+                onText: (text) => (text.data = convertToLTR(text.data)),
+            }}
         >
             <RenderHTMLConfigProvider
                 defaultTextProps={defaultTextProps}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
index d91510c3ec6a..a0b6b0dadf9f 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
@@ -1,5 +1,6 @@
 import _ from 'underscore';
 import React from 'react';
+import CONST from '../../../CONST';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../../withLocalize';
 import Text from '../../Text';
@@ -17,21 +18,23 @@ function EditedRenderer(props) {
     const defaultRendererProps = _.omit(props, ['TDefaultRenderer', 'style', 'tnode']);
     const isPendingDelete = Boolean(props.tnode.attributes.deleted !== undefined);
     return (
-        <Text
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...defaultRendererProps}
-            fontSize={variables.fontSizeSmall}
-            color={themeColors.textSupporting}
-            style={[editedLabelStyles, isPendingDelete && styles.offlineFeedback.deleted]}
-        >
-            {/* Native devices do not support margin between nested text */}
+        <Text>
             <Text
                 selectable={false}
-                style={[styles.w1, styles.userSelectNone]}
+                style={styles.userSelectNone}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {' '}
             </Text>
-            {props.translate('reportActionCompose.edited')}
+            <Text
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...defaultRendererProps}
+                fontSize={variables.fontSizeSmall}
+                color={themeColors.textSupporting}
+                style={[editedLabelStyles, isPendingDelete && styles.offlineFeedback.deleted]}
+            >
+                {props.translate('reportActionCompose.edited')}
+            </Text>
         </Text>
     );
 }
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
index bfe39459ed74..74cf83a4a6f0 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
@@ -1,4 +1,6 @@
-import React from 'react';
+import React, {memo} from 'react';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import Navigation from '../../../libs/Navigation/Navigation';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import styles from '../../../styles/styles';
@@ -8,12 +10,15 @@ import CONST from '../../../CONST';
 import {ShowContextMenuContext, showContextMenuForReport} from '../../ShowContextMenuContext';
 import tryResolveUrlFromApiRoot from '../../../libs/tryResolveUrlFromApiRoot';
 import * as ReportUtils from '../../../libs/ReportUtils';
-import withLocalize, {withLocalizePropTypes} from '../../withLocalize';
 import ROUTES from '../../../ROUTES';
+import ONYXKEYS from '../../../ONYXKEYS';
+import useLocalize from '../../../hooks/useLocalize';
 
-const propTypes = {...htmlRendererPropTypes, ...withLocalizePropTypes};
+const propTypes = {...htmlRendererPropTypes};
 
 function ImageRenderer(props) {
+    const {translate} = useLocalize();
+
     const htmlAttribs = props.tnode.attributes;
 
     // There are two kinds of images that need to be displayed:
@@ -72,7 +77,7 @@ function ImageRenderer(props) {
                         )
                     }
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                    accessibilityLabel={props.translate('accessibilityHints.viewAttachment')}
+                    accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                 >
                     <ThumbnailImage
                         previewSourceURL={previewSource}
@@ -90,4 +95,15 @@ function ImageRenderer(props) {
 ImageRenderer.propTypes = propTypes;
 ImageRenderer.displayName = 'ImageRenderer';
 
-export default withLocalize(ImageRenderer);
+export default withOnyx({
+    user: {
+        key: ONYXKEYS.USER,
+    },
+})(
+    memo(
+        ImageRenderer,
+        (prevProps, nextProps) =>
+            lodashGet(prevProps, 'tnode.attributes') === lodashGet(nextProps, 'tnode.attributes') &&
+            lodashGet(prevProps, 'user.shouldUseStagingServer') === lodashGet(nextProps, 'user.shouldUseStagingServer'),
+    ),
+);
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
index 7f7753dfea44..947a15ac6efb 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
@@ -11,6 +11,7 @@ import personalDetailsPropType from '../../../pages/personalDetailsPropType';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import * as PersonalDetailsUtils from '../../../libs/PersonalDetailsUtils';
 import TextLink from '../../TextLink';
+import CONST from '../../../CONST';
 
 const propTypes = {
     ...htmlRendererPropTypes,
@@ -31,8 +32,8 @@ const showUserDetails = (email) => Navigation.navigate(ROUTES.getDetailsRoute(em
 function MentionUserRenderer(props) {
     const defaultRendererProps = _.omit(props, ['TDefaultRenderer', 'style']);
 
-    // We need to remove the leading @ from data as it is not part of the login
-    const loginWithoutLeadingAt = props.tnode.data ? props.tnode.data.slice(1) : '';
+    // We need to remove the LTR unicode and leading @ from data as it is not part of the login
+    const loginWithoutLeadingAt = props.tnode.data ? props.tnode.data.replace(CONST.UNICODE.LTR, '').slice(1) : '';
 
     const accountID = _.first(PersonalDetailsUtils.getAccountIDsByLogins([loginWithoutLeadingAt]));
 
diff --git a/src/components/HTMLEngineProvider/applyStrikethrough/index.js b/src/components/HTMLEngineProvider/applyStrikethrough/index.js
deleted file mode 100644
index b754a37dbde9..000000000000
--- a/src/components/HTMLEngineProvider/applyStrikethrough/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function applyStrikethrough(html) {
-    return html;
-}
-
-export default applyStrikethrough;
diff --git a/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js b/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js
deleted file mode 100644
index 266e4eb20f62..000000000000
--- a/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function applyStrikethrough(html, isPendingDelete) {
-    if (isPendingDelete) {
-        return `<del>${html}</del>`;
-    }
-    return html;
-}
-
-export default applyStrikethrough;
diff --git a/src/components/HeaderGap/index.desktop.js b/src/components/HeaderGap/index.desktop.js
index 10974aa9f5ee..6b47f56516de 100644
--- a/src/components/HeaderGap/index.desktop.js
+++ b/src/components/HeaderGap/index.desktop.js
@@ -1,9 +1,22 @@
 import React, {PureComponent} from 'react';
 import {View} from 'react-native';
+import PropTypes from 'prop-types';
 import styles from '../../styles/styles';
 
-export default class HeaderGap extends PureComponent {
+const propTypes = {
+    /** Styles to apply to the HeaderGap */
+    // eslint-disable-next-line react/forbid-prop-types
+    styles: PropTypes.arrayOf(PropTypes.object),
+};
+
+class HeaderGap extends PureComponent {
     render() {
-        return <View style={styles.headerGap} />;
+        return <View style={[styles.headerGap, ...this.props.styles]} />;
     }
 }
+
+HeaderGap.propTypes = propTypes;
+HeaderGap.defaultProps = {
+    styles: [],
+};
+export default HeaderGap;
diff --git a/src/components/Hoverable/hoverablePropTypes.js b/src/components/Hoverable/hoverablePropTypes.js
index 9fb2e3bc7306..d483a06d6aaf 100644
--- a/src/components/Hoverable/hoverablePropTypes.js
+++ b/src/components/Hoverable/hoverablePropTypes.js
@@ -12,12 +12,16 @@ const propTypes = {
 
     /** Function that executes when the mouse leaves the children. */
     onHoverOut: PropTypes.func,
+
+    /** Decides whether to handle the scroll behaviour to show hover once the scroll ends */
+    shouldHandleScroll: PropTypes.bool,
 };
 
 const defaultProps = {
     disabled: false,
     onHoverIn: () => {},
     onHoverOut: () => {},
+    shouldHandleScroll: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/Hoverable/index.js b/src/components/Hoverable/index.js
index 35bbd4af7fd6..5da41f1388fb 100644
--- a/src/components/Hoverable/index.js
+++ b/src/components/Hoverable/index.js
@@ -1,7 +1,9 @@
 import _ from 'underscore';
 import React, {Component} from 'react';
+import {DeviceEventEmitter} from 'react-native';
 import {propTypes, defaultProps} from './hoverablePropTypes';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
+import CONST from '../../CONST';
 
 /**
  * It is necessary to create a Hoverable component instead of relying solely on Pressable support for hover state,
@@ -13,16 +15,43 @@ class Hoverable extends Component {
         super(props);
 
         this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+        this.checkHover = this.checkHover.bind(this);
 
         this.state = {
             isHovered: false,
         };
 
+        this.isHoveredRef = false;
+        this.isScrollingRef = false;
         this.wrapperView = null;
     }
 
     componentDidMount() {
         document.addEventListener('visibilitychange', this.handleVisibilityChange);
+        document.addEventListener('mouseover', this.checkHover);
+
+        /**
+         * Only add the scrolling listener if the shouldHandleScroll prop is true
+         * and the scrollingListener is not already set.
+         */
+        if (!this.scrollingListener && this.props.shouldHandleScroll) {
+            this.scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling) => {
+                /**
+                 * If user has stopped scrolling and the isHoveredRef is true, then we should update the hover state.
+                 */
+                if (!scrolling && this.isHoveredRef) {
+                    this.setState({isHovered: this.isHoveredRef}, this.props.onHoverIn);
+                } else if (scrolling && this.isHoveredRef) {
+                    /**
+                     * If the user has started scrolling and the isHoveredRef is true, then we should set the hover state to false.
+                     * This is to hide the existing hover and reaction bar.
+                     */
+                    this.isHoveredRef = false;
+                    this.setState({isHovered: false}, this.props.onHoverOut);
+                }
+                this.isScrollingRef = scrolling;
+            });
+        }
     }
 
     componentDidUpdate(prevProps) {
@@ -37,6 +66,10 @@ class Hoverable extends Component {
 
     componentWillUnmount() {
         document.removeEventListener('visibilitychange', this.handleVisibilityChange);
+        document.removeEventListener('mouseover', this.checkHover);
+        if (this.scrollingListener) {
+            this.scrollingListener.remove();
+        }
     }
 
     /**
@@ -49,11 +82,40 @@ class Hoverable extends Component {
             return;
         }
 
+        /**
+         * Capture whther or not the user is hovering over the component.
+         * We will use this to determine if we should update the hover state when the user has stopped scrolling.
+         */
+        this.isHoveredRef = isHovered;
+
+        /**
+         * If the isScrollingRef is true, then the user is scrolling and we should not update the hover state.
+         */
+        if (this.isScrollingRef && this.props.shouldHandleScroll && !this.state.isHovered) return;
+
         if (isHovered !== this.state.isHovered) {
             this.setState({isHovered}, isHovered ? this.props.onHoverIn : this.props.onHoverOut);
         }
     }
 
+    /**
+     * Checks the hover state of a component and updates it based on the event target.
+     * This is necessary to handle cases where the hover state might get stuck due to an unreliable mouseleave trigger,
+     * such as when an element is removed before the mouseleave event is triggered.
+     * @param {Event} e - The hover event object.
+     */
+    checkHover(e) {
+        if (!this.wrapperView || !this.state.isHovered) {
+            return;
+        }
+
+        if (this.wrapperView.contains(e.target)) {
+            return;
+        }
+
+        this.setIsHovered(false);
+    }
+
     handleVisibilityChange() {
         if (document.visibilityState !== 'hidden') {
             return;
diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js
index 42db57068edc..a0c8b72d755a 100644
--- a/src/components/Icon/Expensicons.js
+++ b/src/components/Icon/Expensicons.js
@@ -82,7 +82,6 @@ import NewWorkspace from '../../../assets/images/new-workspace.svg';
 import Offline from '../../../assets/images/offline.svg';
 import OfflineCloud from '../../../assets/images/offline-cloud.svg';
 import Paperclip from '../../../assets/images/paperclip.svg';
-import PayPal from '../../../assets/images/paypal.svg';
 import Paycheck from '../../../assets/images/paycheck.svg';
 import Pencil from '../../../assets/images/pencil.svg';
 import Phone from '../../../assets/images/phone.svg';
@@ -216,7 +215,6 @@ export {
     Offline,
     OfflineCloud,
     Paperclip,
-    PayPal,
     Paycheck,
     Pencil,
     Phone,
diff --git a/src/components/IllustratedHeaderPageLayout.js b/src/components/IllustratedHeaderPageLayout.js
index d1403bd4029e..92a9c8b8552b 100644
--- a/src/components/IllustratedHeaderPageLayout.js
+++ b/src/components/IllustratedHeaderPageLayout.js
@@ -12,6 +12,7 @@ import * as StyleUtils from '../styles/StyleUtils';
 import useWindowDimensions from '../hooks/useWindowDimensions';
 import FixedFooter from './FixedFooter';
 import useNetwork from '../hooks/useNetwork';
+import * as Browser from '../libs/Browser';
 
 const propTypes = {
     ...headerWithBackButtonPropTypes,
@@ -27,22 +28,28 @@ const propTypes = {
 
     /** A fixed footer to display at the bottom of the page. */
     footer: PropTypes.node,
+
+    /** Overlay content to display on top of animation */
+    overlayContent: PropTypes.func,
 };
 
 const defaultProps = {
     backgroundColor: themeColors.appBG,
     footer: null,
+    overlayContent: null,
 };
 
-function IllustratedHeaderPageLayout({backgroundColor, children, illustration, footer, ...propsToPassToHeader}) {
-    const {windowHeight} = useWindowDimensions();
+function IllustratedHeaderPageLayout({backgroundColor, children, illustration, footer, overlayContent, ...propsToPassToHeader}) {
     const {isOffline} = useNetwork();
+    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
+    const appBGColor = StyleUtils.getBackgroundColorStyle(themeColors.appBG);
+
     return (
         <ScreenWrapper
             style={[StyleUtils.getBackgroundColorStyle(backgroundColor)]}
             shouldEnablePickerAvoiding={false}
             includeSafeAreaPaddingBottom={false}
-            offlineIndicatorStyle={[StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}
+            offlineIndicatorStyle={[appBGColor]}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
@@ -52,12 +59,19 @@ function IllustratedHeaderPageLayout({backgroundColor, children, illustration, f
                         titleColor={backgroundColor === themeColors.appBG ? undefined : themeColors.textColorfulBackground}
                         iconFill={backgroundColor === themeColors.appBG ? undefined : themeColors.iconColorfulBackground}
                     />
-                    <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(themeColors.appBG), !isOffline ? safeAreaPaddingBottomStyle : {}]}>
+                    <View style={[styles.flex1, appBGColor, !isOffline ? safeAreaPaddingBottomStyle : {}]}>
+                        {/* Safari on ios/mac has a bug where overscrolling the page scrollview shows green the background color. This is a workaround to fix that. https://github.com/Expensify/App/issues/23422 */}
+                        {Browser.isSafari() && (
+                            <View style={[styles.dualColorOverscrollSpacer]}>
+                                <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(backgroundColor)]} />
+                                <View style={[isSmallScreenWidth ? styles.flex1 : styles.flex3, appBGColor]} />
+                            </View>
+                        )}
                         <ScrollView
                             contentContainerStyle={safeAreaPaddingBottomStyle}
                             showsVerticalScrollIndicator={false}
                         >
-                            <View style={styles.overscrollSpacer(backgroundColor, windowHeight)} />
+                            {!Browser.isSafari() && <View style={styles.overscrollSpacer(backgroundColor, windowHeight)} />}
                             <View style={[styles.alignItemsCenter, styles.justifyContentEnd, StyleUtils.getBackgroundColorStyle(backgroundColor)]}>
                                 <Lottie
                                     source={illustration}
@@ -65,8 +79,9 @@ function IllustratedHeaderPageLayout({backgroundColor, children, illustration, f
                                     autoPlay
                                     loop
                                 />
+                                {overlayContent && overlayContent()}
                             </View>
-                            <View style={[styles.pt5]}>{children}</View>
+                            <View style={[styles.pt5, appBGColor]}>{children}</View>
                         </ScrollView>
                         {!_.isNull(footer) && <FixedFooter>{footer}</FixedFooter>}
                     </View>
diff --git a/src/components/Image/imagePropTypes.js b/src/components/Image/imagePropTypes.js
index 3e9293bd2437..c02e48eef659 100644
--- a/src/components/Image/imagePropTypes.js
+++ b/src/components/Image/imagePropTypes.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import stylePropTypes from '../../styles/stylePropTypes';
+import sourcePropTypes from './sourcePropTypes';
 import RESIZE_MODES from './resizeModes';
 
 const imagePropTypes = {
@@ -7,14 +8,7 @@ const imagePropTypes = {
     style: stylePropTypes,
 
     /** The static asset or URI source of the image */
-    source: PropTypes.oneOfType([
-        PropTypes.number,
-        PropTypes.shape({
-            uri: PropTypes.string.isRequired,
-            // eslint-disable-next-line react/forbid-prop-types
-            headers: PropTypes.object,
-        }),
-    ]).isRequired,
+    source: sourcePropTypes.isRequired,
 
     /** Should an auth token be included in the image request */
     isAuthTokenRequired: PropTypes.bool,
diff --git a/src/components/Image/index.js b/src/components/Image/index.js
index 4b44bd30363d..7434c16c6491 100644
--- a/src/components/Image/index.js
+++ b/src/components/Image/index.js
@@ -22,7 +22,9 @@ function Image(props) {
             return {uri: `${propsSource.uri}?encryptedAuthToken=${encodeURIComponent(authToken)}`};
         }
         return propsSource;
-    }, [propsSource, isAuthTokenRequired, session]);
+        // 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.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [propsSource, isAuthTokenRequired]);
 
     /**
      * The natural image dimensions are retrieved using the updated source
diff --git a/src/components/Image/index.native.js b/src/components/Image/index.native.js
index 0713fa6c7fe2..9d9ad600b1d4 100644
--- a/src/components/Image/index.native.js
+++ b/src/components/Image/index.native.js
@@ -18,7 +18,10 @@ function Image(props) {
     const {source, isAuthTokenRequired, session, ...rest} = props;
 
     let imageSource = source;
-    if (typeof source !== 'number' && isAuthTokenRequired) {
+    if (source && source.uri && typeof source.uri === 'number') {
+        imageSource = source.uri;
+    }
+    if (typeof imageSource !== 'number' && isAuthTokenRequired) {
         const authToken = lodashGet(props, 'session.encryptedAuthToken', null);
         imageSource = {
             ...source,
diff --git a/src/components/Image/sourcePropTypes/index.js b/src/components/Image/sourcePropTypes/index.js
new file mode 100644
index 000000000000..99e88b5cf343
--- /dev/null
+++ b/src/components/Image/sourcePropTypes/index.js
@@ -0,0 +1,11 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.shape({
+        uri: PropTypes.string.isRequired,
+        // eslint-disable-next-line react/forbid-prop-types
+        headers: PropTypes.object,
+    }),
+    PropTypes.string,
+]);
diff --git a/src/components/Image/sourcePropTypes/index.native.js b/src/components/Image/sourcePropTypes/index.native.js
new file mode 100644
index 000000000000..629b21852613
--- /dev/null
+++ b/src/components/Image/sourcePropTypes/index.native.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.shape({
+        uri: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+        // eslint-disable-next-line react/forbid-prop-types
+        headers: PropTypes.object,
+    }),
+]);
diff --git a/src/components/InvertedFlatList/index.js b/src/components/InvertedFlatList/index.js
index 923a17210af7..74409e9a0fe0 100644
--- a/src/components/InvertedFlatList/index.js
+++ b/src/components/InvertedFlatList/index.js
@@ -1,9 +1,10 @@
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect, useRef} from 'react';
 import PropTypes from 'prop-types';
-import {FlatList, StyleSheet} from 'react-native';
+import {DeviceEventEmitter, FlatList, StyleSheet} from 'react-native';
 import _ from 'underscore';
 import BaseInvertedFlatList from './BaseInvertedFlatList';
 import styles from '../../styles/styles';
+import CONST from '../../CONST';
 
 const propTypes = {
     /** Passed via forwardRef so we can access the FlatList ref */
@@ -14,43 +15,118 @@ const propTypes = {
     /** Any additional styles to apply */
     // eslint-disable-next-line react/forbid-prop-types
     contentContainerStyle: PropTypes.any,
+
+    /** Same as for FlatList */
+    onScroll: PropTypes.func,
 };
 
 // This is adapted from https://codesandbox.io/s/react-native-dsyse
 // It's a HACK alert since FlatList has inverted scrolling on web
-class InvertedFlatList extends React.Component {
-    constructor(props) {
-        super(props);
+function InvertedFlatList(props) {
+    const {innerRef, contentContainerStyle} = props;
+    const listRef = React.createRef();
 
-        this.list = undefined;
-    }
+    const lastScrollEvent = useRef(null);
+    const scrollEndTimeout = useRef(null);
+    const updateInProgress = useRef(false);
+    const eventHandler = useRef(null);
 
-    componentDidMount() {
-        if (!_.isFunction(this.props.innerRef)) {
+    useEffect(() => {
+        if (!_.isFunction(innerRef)) {
             // eslint-disable-next-line no-param-reassign
-            this.props.innerRef.current = this.list;
+            innerRef.current = listRef.current;
         } else {
-            this.props.innerRef(this.list);
+            innerRef(listRef);
+        }
+
+        return () => {
+            if (scrollEndTimeout.current) {
+                clearTimeout(scrollEndTimeout.current);
+            }
+
+            if (eventHandler.current) {
+                eventHandler.current.remove();
+            }
+        };
+    }, [innerRef, listRef]);
+
+    /**
+     * Emits when the scrolling is in progress. Also,
+     * invokes the onScroll callback function from props.
+     *
+     * @param {Event} event - The onScroll event from the FlatList
+     */
+    const onScroll = (event) => {
+        props.onScroll(event);
+
+        if (!updateInProgress.current) {
+            updateInProgress.current = true;
+            eventHandler.current = DeviceEventEmitter.emit(CONST.EVENTS.SCROLLING, true);
+        }
+    };
+
+    /**
+     * Emits when the scrolling has ended.
+     */
+    const onScrollEnd = () => {
+        eventHandler.current = DeviceEventEmitter.emit(CONST.EVENTS.SCROLLING, false);
+        updateInProgress.current = false;
+    };
+
+    /**
+     * Decides whether the scrolling has ended or not. If it has ended,
+     * then it calls the onScrollEnd function. Otherwise, it calls the
+     * onScroll function and pass the event to it.
+     *
+     * This is a temporary work around, since react-native-web doesn't
+     * support onScrollBeginDrag and onScrollEndDrag props for FlatList.
+     * More info:
+     * https://github.com/necolas/react-native-web/pull/1305
+     *
+     * This workaround is taken from below and refactored to fit our needs:
+     * https://github.com/necolas/react-native-web/issues/1021#issuecomment-984151185
+     *
+     * @param {Event} event - The onScroll event from the FlatList
+     */
+    const handleScroll = (event) => {
+        onScroll(event);
+        const timestamp = Date.now();
+
+        if (scrollEndTimeout.current) {
+            clearTimeout(scrollEndTimeout.current);
         }
-    }
-
-    render() {
-        return (
-            <BaseInvertedFlatList
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...this.props}
-                inverted
-                ref={(el) => (this.list = el)}
-                shouldMeasureItems
-                contentContainerStyle={StyleSheet.compose(this.props.contentContainerStyle, styles.justifyContentEnd)}
-            />
-        );
-    }
+
+        if (lastScrollEvent.current) {
+            scrollEndTimeout.current = setTimeout(() => {
+                if (lastScrollEvent.current !== timestamp) {
+                    return;
+                }
+                // Scroll has ended
+                lastScrollEvent.current = null;
+                onScrollEnd();
+            }, 250);
+        }
+
+        lastScrollEvent.current = timestamp;
+    };
+
+    return (
+        <BaseInvertedFlatList
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            inverted
+            ref={listRef}
+            shouldMeasureItems
+            contentContainerStyle={StyleSheet.compose(contentContainerStyle, styles.justifyContentEnd)}
+            onScroll={handleScroll}
+        />
+    );
 }
 
 InvertedFlatList.propTypes = propTypes;
 InvertedFlatList.defaultProps = {
     contentContainerStyle: {},
+    onScroll: () => {},
 };
 
 export default forwardRef((props, ref) => (
diff --git a/src/components/KYCWall/BaseKYCWall.js b/src/components/KYCWall/BaseKYCWall.js
index 4684901e47b1..ebf115c5de59 100644
--- a/src/components/KYCWall/BaseKYCWall.js
+++ b/src/components/KYCWall/BaseKYCWall.js
@@ -142,7 +142,6 @@ class KYCWall extends React.Component {
                         vertical: this.state.anchorPositionVertical,
                         horizontal: this.state.anchorPositionHorizontal,
                     }}
-                    shouldShowPaypal={false}
                     onItemSelected={(item) => {
                         this.setState({shouldShowAddPaymentMenu: false});
                         if (item === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
diff --git a/src/components/KeyboardShortcutsModal.js b/src/components/KeyboardShortcutsModal.js
index 9d78a22b5aa8..6ca3cce6412c 100644
--- a/src/components/KeyboardShortcutsModal.js
+++ b/src/components/KeyboardShortcutsModal.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import PropTypes from 'prop-types';
 import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -41,7 +41,7 @@ const openShortcutModalConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUT_MODAL;
 function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidth, translate}) {
     const subscribedOpenModalShortcuts = useRef([]);
     const modalType = isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE;
-    const shortcuts = KeyboardShortcut.getDocumentedShortcuts();
+    const [shortcuts, setShortcurts] = useState([]);
 
     /*
      * Subscribe shortcuts that only are used when the modal is open
@@ -79,6 +79,7 @@ function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidt
             KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, () => {}, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true),
             KeyboardShortcut.subscribe(arrowDownConfig.shortcutKey, () => {}, arrowDownConfig.descriptionKey, arrowDownConfig.modifiers, true),
         ];
+        setShortcurts(KeyboardShortcut.getDocumentedShortcuts());
     };
 
     /*
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 95b1fc0f801e..f5a293701454 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -12,7 +12,6 @@ import * as Expensicons from '../Icon/Expensicons';
 import MultipleAvatars from '../MultipleAvatars';
 import Hoverable from '../Hoverable';
 import DisplayNames from '../DisplayNames';
-import colors from '../../styles/colors';
 import Text from '../Text';
 import SubscriptAvatar from '../SubscriptAvatar';
 import CONST from '../../CONST';
@@ -121,7 +120,8 @@ function OptionRowLHN(props) {
             '',
             popoverAnchor,
             props.reportID,
-            {},
+            '0',
+            props.reportID,
             '',
             () => {},
             () => setIsContextMenuActive(false),
@@ -245,7 +245,7 @@ function OptionRowLHN(props) {
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                         <Icon
                                             src={Expensicons.DotIndicator}
-                                            fill={colors.red}
+                                            fill={themeColors.danger}
                                         />
                                     </View>
                                 )}
@@ -256,10 +256,12 @@ function OptionRowLHN(props) {
                             accessible={false}
                         >
                             {shouldShowGreenDotIndicator && (
-                                <Icon
-                                    src={Expensicons.DotIndicator}
-                                    fill={themeColors.success}
-                                />
+                                <View style={styles.ml2}>
+                                    <Icon
+                                        src={Expensicons.DotIndicator}
+                                        fill={themeColors.success}
+                                    />
+                                </View>
                             )}
                             {optionItem.hasDraftComment && optionItem.isAllowedToComment && (
                                 <View
diff --git a/src/components/LHNOptionsList/OptionRowLHNData.js b/src/components/LHNOptionsList/OptionRowLHNData.js
index 21fade6eb942..2c51d6332946 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.js
+++ b/src/components/LHNOptionsList/OptionRowLHNData.js
@@ -12,6 +12,9 @@ import withCurrentReportID, {withCurrentReportIDPropTypes, withCurrentReportIDDe
 import OptionRowLHN, {propTypes as basePropTypes, defaultProps as baseDefaultProps} from './OptionRowLHN';
 import * as Report from '../../libs/actions/Report';
 import * as UserUtils from '../../libs/UserUtils';
+import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
+import * as TransactionUtils from '../../libs/TransactionUtils';
+
 import participantPropTypes from '../participantPropTypes';
 import CONST from '../../CONST';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
@@ -30,21 +33,25 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     fullReport: PropTypes.object,
 
-    /** The policies which the user has access to and which the report could be tied to */
-    policies: PropTypes.objectOf(
-        PropTypes.shape({
-            /** The ID of the policy */
-            id: PropTypes.string,
-            /** Name of the policy */
-            name: PropTypes.string,
-            /** Avatar of the policy */
-            avatar: PropTypes.string,
-        }),
-    ),
+    /** The policy which the user has access to and which the report could be tied to */
+    policy: PropTypes.shape({
+        /** The ID of the policy */
+        id: PropTypes.string,
+        /** Name of the policy */
+        name: PropTypes.string,
+        /** Avatar of the policy */
+        avatar: PropTypes.string,
+    }),
 
     /** The actions from the parent report */
     parentReportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
 
+    /** The transaction from the parent report action */
+    transaction: PropTypes.shape({
+        /** The ID of the transaction */
+        transactionID: PropTypes.string,
+    }),
+
     ...withCurrentReportIDPropTypes,
     ...basePropTypes,
 };
@@ -53,8 +60,9 @@ const defaultProps = {
     shouldDisableFocusOptions: false,
     personalDetails: {},
     fullReport: {},
-    policies: {},
+    policy: {},
     parentReportActions: {},
+    transaction: {},
     preferredLocale: CONST.LOCALES.DEFAULT,
     ...withCurrentReportIDDefaultProps,
     ...baseDefaultProps,
@@ -74,8 +82,10 @@ function OptionRowLHNData({
     personalDetails,
     preferredLocale,
     comment,
-    policies,
+    policy,
+    receiptTransactions,
     parentReportActions,
+    transaction,
     ...propsToForward
 }) {
     const reportID = propsToForward.reportID;
@@ -83,11 +93,17 @@ function OptionRowLHNData({
     // instead of a changing number (so we prevent unnecessary re-renders).
     const isFocused = !shouldDisableFocusOptions && currentReportID === reportID;
 
-    const policy = lodashGet(policies, [`${ONYXKEYS.COLLECTION.POLICY}${fullReport.policyID}`], '');
-
     const parentReportAction = parentReportActions[fullReport.parentReportActionID];
 
     const optionItemRef = useRef();
+
+    const linkedTransaction = useMemo(() => {
+        const sortedReportActions = ReportActionsUtils.getSortedReportActionsForDisplay(reportActions);
+        const lastReportAction = _.first(sortedReportActions);
+        return TransactionUtils.getLinkedTransaction(lastReportAction);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [fullReport.reportID, receiptTransactions, reportActions]);
+
     const optionItem = useMemo(() => {
         // Note: ideally we'd have this as a dependent selector in onyx!
         const item = SidebarUtils.getOptionData(fullReport, reportActions, personalDetails, preferredLocale, policy);
@@ -97,8 +113,9 @@ function OptionRowLHNData({
         optionItemRef.current = item;
         return item;
         // Listen parentReportAction to update title of thread report when parentReportAction changed
+        // Listen to transaction to update title of transaction report when transaction changed
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [fullReport, reportActions, personalDetails, preferredLocale, policy, parentReportAction]);
+    }, [fullReport, linkedTransaction, reportActions, personalDetails, preferredLocale, policy, parentReportAction, transaction]);
 
     useEffect(() => {
         if (!optionItem || optionItem.hasDraftComment || !comment || comment.length <= 0 || isFocused) {
@@ -177,15 +194,26 @@ export default React.memo(
             preferredLocale: {
                 key: ONYXKEYS.NVP_PREFERRED_LOCALE,
             },
-            policies: {
-                key: ONYXKEYS.COLLECTION.POLICY,
-            },
         }),
         withOnyx({
             parentReportActions: {
                 key: ({fullReport}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fullReport.parentReportID}`,
                 canEvict: false,
             },
+            policy: {
+                key: ({fullReport}) => `${ONYXKEYS.COLLECTION.POLICY}${fullReport.policyID}`,
+            },
+            // Ideally, we aim to access only the last transaction for the current report by listening to changes in reportActions.
+            // In some scenarios, a transaction might be created after reportActions have been modified.
+            // This can lead to situations where `lastTransaction` doesn't update and retains the previous value.
+            // However, performance overhead of this is minimized by using memos inside the component.
+            receiptTransactions: {key: ONYXKEYS.COLLECTION.TRANSACTION},
+        }),
+        withOnyx({
+            transaction: {
+                key: ({fullReport, parentReportActions}) =>
+                    `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportActions, [fullReport.parentReportActionID, 'originalMessage', 'IOUTransactionID'], '')}`,
+            },
         }),
     )(OptionRowLHNData),
 );
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
index 532c29535e50..435f88e51e53 100644
--- a/src/components/LocalePicker.js
+++ b/src/components/LocalePicker.js
@@ -27,9 +27,11 @@ const defaultProps = {
 };
 
 function LocalePicker(props) {
-    const localesToLanguages = _.map(props.translate('languagePage.languages'), (language, key) => ({
-        value: key,
-        label: language.label,
+    const localesToLanguages = _.map(CONST.LANGUAGES, (language) => ({
+        value: language,
+        label: props.translate(`languagePage.languages.${language}.label`),
+        keyForList: language,
+        isSelected: props.preferredLocale === language,
     }));
     return (
         <Picker
diff --git a/src/components/LottieAnimations.js b/src/components/LottieAnimations.js
index ca05cebcb832..274d60306393 100644
--- a/src/components/LottieAnimations.js
+++ b/src/components/LottieAnimations.js
@@ -5,5 +5,6 @@ const PreferencesDJ = require('../../assets/animations/PreferencesDJ.json');
 const ReviewingBankInfo = require('../../assets/animations/ReviewingBankInfo.json');
 const WorkspacePlanet = require('../../assets/animations/WorkspacePlanet.json');
 const SaveTheWorld = require('../../assets/animations/SaveTheWorld.json');
+const Safe = require('../../assets/animations/Safe.json');
 
-export {ExpensifyLounge, Fireworks, Hands, PreferencesDJ, ReviewingBankInfo, SaveTheWorld, WorkspacePlanet};
+export {ExpensifyLounge, Fireworks, Hands, PreferencesDJ, ReviewingBankInfo, SaveTheWorld, WorkspacePlanet, Safe};
diff --git a/src/components/MagicCodeInput.js b/src/components/MagicCodeInput.js
index b21a275a6597..454aacc8a03b 100644
--- a/src/components/MagicCodeInput.js
+++ b/src/components/MagicCodeInput.js
@@ -258,7 +258,13 @@ function MagicCodeInput(props) {
                         {/* Hide the input above the text. Cannot set opacity to 0 as it would break pasting on iOS Safari. */}
                         <View style={[StyleSheet.absoluteFillObject, styles.w100, styles.bgTransparent]}>
                             <TextInput
-                                ref={(ref) => (inputRefs.current[index] = ref)}
+                                ref={(ref) => {
+                                    inputRefs.current[index] = ref;
+                                    // Setting attribute type to "search" to prevent Password Manager from appearing in Mobile Chrome
+                                    if (ref && ref.setAttribute) {
+                                        ref.setAttribute('type', 'search');
+                                    }
+                                }}
                                 autoFocus={index === 0 && props.autoFocus}
                                 inputMode="numeric"
                                 textContentType="oneTimeCode"
diff --git a/src/components/MapView/Direction.tsx b/src/components/MapView/Direction.tsx
new file mode 100644
index 000000000000..920a3912dca4
--- /dev/null
+++ b/src/components/MapView/Direction.tsx
@@ -0,0 +1,30 @@
+import Mapbox from '@rnmapbox/maps';
+import {DirectionProps} from './MapViewTypes';
+import styles from '../../styles/styles';
+
+function Direction({coordinates}: DirectionProps) {
+    if (coordinates.length < 1) {
+        return null;
+    }
+
+    return (
+        <Mapbox.ShapeSource
+            id="routeSource"
+            shape={{
+                type: 'Feature',
+                properties: {},
+                geometry: {
+                    type: 'LineString',
+                    coordinates,
+                },
+            }}
+        >
+            <Mapbox.LineLayer
+                id="routeFill"
+                style={styles.mapDirection}
+            />
+        </Mapbox.ShapeSource>
+    );
+}
+
+export default Direction;
diff --git a/src/components/MapView/Direction.web.tsx b/src/components/MapView/Direction.web.tsx
new file mode 100644
index 000000000000..190ecb03cb5e
--- /dev/null
+++ b/src/components/MapView/Direction.web.tsx
@@ -0,0 +1,48 @@
+// Explanation: Different Mapbox libraries are required for web and native mobile platforms.
+// This is why we have separate components for web and native to handle the specific implementations.
+// For the web version, we use the Mapbox Web library called react-map-gl, while for the native mobile version,
+// we utilize a different Mapbox library @rnmapbox/maps tailored for mobile development.
+
+import React from 'react';
+import {View} from 'react-native';
+import {Layer, Source} from 'react-map-gl';
+import {DirectionProps} from './MapViewTypes';
+
+import styles from '../../styles/styles';
+
+function Direction({coordinates}: DirectionProps) {
+    const layerLayoutStyle: Record<string, string> = styles.mapDirectionLayer.layout;
+    const layerPointStyle: Record<string, string | number> = styles.mapDirectionLayer.paint;
+
+    if (coordinates.length < 1) {
+        return null;
+    }
+    return (
+        <View>
+            {coordinates && (
+                <Source
+                    id="route"
+                    type="geojson"
+                    data={{
+                        type: 'Feature',
+                        properties: {},
+                        geometry: {
+                            type: 'LineString',
+                            coordinates,
+                        },
+                    }}
+                >
+                    <Layer
+                        id="route"
+                        type="line"
+                        source="route"
+                        paint={layerPointStyle}
+                        layout={layerLayoutStyle}
+                    />
+                </Source>
+            )}
+        </View>
+    );
+}
+
+export default Direction;
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
new file mode 100644
index 000000000000..7a2248ffafb9
--- /dev/null
+++ b/src/components/MapView/MapView.tsx
@@ -0,0 +1,103 @@
+import {View} from 'react-native';
+import {useFocusEffect} from '@react-navigation/native';
+import Mapbox, {MapState, MarkerView, setAccessToken} from '@rnmapbox/maps';
+import {forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import styles from '../../styles/styles';
+
+import responder from './responder';
+import utils from './utils';
+import Direction from './Direction';
+import CONST from '../../CONST';
+
+import {MapViewProps, MapViewHandle} from './MapViewTypes';
+
+const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, mapPadding, styleURL, pitchEnabled, initialState, waypoints, directionCoordinates, onMapReady}, ref) => {
+    const cameraRef = useRef<Mapbox.Camera>(null);
+    const [isIdle, setIsIdle] = useState(false);
+
+    useImperativeHandle(
+        ref,
+        () => ({
+            flyTo: (location: [number, number], zoomLevel: number = CONST.MAPBOX.DEFAULT_ZOOM, animationDuration?: number) =>
+                cameraRef.current?.setCamera({zoomLevel, centerCoordinate: location, animationDuration}),
+            fitBounds: (northEast: [number, number], southWest: [number, number], paddingConfig?: number | number[] | undefined, animationDuration?: number | undefined) =>
+                cameraRef.current?.fitBounds(northEast, southWest, paddingConfig, animationDuration),
+        }),
+        [],
+    );
+
+    // When the page loses focus, we temporarily set the "idled" state to false.
+    // When the page regains focus, the onIdled method of the map will set the actual "idled" state,
+    // which in turn triggers the callback.
+    useFocusEffect(
+        useCallback(() => {
+            if (waypoints?.length && isIdle) {
+                if (waypoints.length === 1) {
+                    cameraRef.current?.setCamera({
+                        zoomLevel: 15,
+                        animationDuration: 1500,
+                        centerCoordinate: waypoints[0].coordinate,
+                    });
+                } else {
+                    const {southWest, northEast} = utils.getBounds(waypoints.map((waypoint) => waypoint.coordinate));
+                    cameraRef.current?.fitBounds(northEast, southWest, mapPadding, 1000);
+                }
+            }
+            return () => {
+                setIsIdle(false);
+            };
+        }, [mapPadding, waypoints, isIdle]),
+    );
+
+    useEffect(() => {
+        setAccessToken(accessToken);
+    }, [accessToken]);
+
+    const setMapIdle = (e: MapState) => {
+        if (e.gestures.isGestureActive) return;
+        setIsIdle(true);
+        if (onMapReady) {
+            onMapReady();
+        }
+    };
+
+    return (
+        <View style={style}>
+            <Mapbox.MapView
+                style={{flex: 1}}
+                styleURL={styleURL}
+                onMapIdle={setMapIdle}
+                pitchEnabled={pitchEnabled}
+                attributionPosition={{...styles.r2, ...styles.b2}}
+                logoPosition={{...styles.l2, ...styles.b2}}
+                // eslint-disable-next-line
+                {...responder.panHandlers}
+            >
+                <Mapbox.Camera
+                    ref={cameraRef}
+                    defaultSettings={{
+                        centerCoordinate: initialState?.location,
+                        zoomLevel: initialState?.zoom,
+                    }}
+                />
+
+                {waypoints?.map(({coordinate, markerComponent, id}) => {
+                    const MarkerComponent = markerComponent;
+                    return (
+                        <MarkerView
+                            id={id}
+                            key={id}
+                            coordinate={coordinate}
+                        >
+                            <MarkerComponent />
+                        </MarkerView>
+                    );
+                })}
+
+                {directionCoordinates && <Direction coordinates={directionCoordinates} />}
+            </Mapbox.MapView>
+        </View>
+    );
+});
+
+export default memo(MapView);
diff --git a/src/components/MapView/MapView.web.tsx b/src/components/MapView/MapView.web.tsx
new file mode 100644
index 000000000000..d1b26df8b00e
--- /dev/null
+++ b/src/components/MapView/MapView.web.tsx
@@ -0,0 +1,96 @@
+// Explanation: Different Mapbox libraries are required for web and native mobile platforms.
+// This is why we have separate components for web and native to handle the specific implementations.
+// For the web version, we use the Mapbox Web library called react-map-gl, while for the native mobile version,
+// we utilize a different Mapbox library @rnmapbox/maps tailored for mobile development.
+
+import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useState} from 'react';
+import {View} from 'react-native';
+import Map, {MapRef, Marker} from 'react-map-gl';
+
+import responder from './responder';
+import utils from './utils';
+
+import CONST from '../../CONST';
+import Direction from './Direction';
+import {MapViewHandle, MapViewProps} from './MapViewTypes';
+
+import 'mapbox-gl/dist/mapbox-gl.css';
+
+const MapView = forwardRef<MapViewHandle, MapViewProps>(
+    ({style, styleURL, waypoints, mapPadding, accessToken, directionCoordinates, initialState = {location: CONST.MAPBOX.DEFAULT_COORDINATE, zoom: CONST.MAPBOX.DEFAULT_ZOOM}}, ref) => {
+        const [mapRef, setMapRef] = useState<MapRef | null>(null);
+        const setRef = useCallback((newRef: MapRef | null) => setMapRef(newRef), []);
+
+        useEffect(() => {
+            if (!waypoints || waypoints.length === 0) {
+                return;
+            }
+
+            if (!mapRef) {
+                return;
+            }
+
+            if (waypoints.length === 1) {
+                mapRef.flyTo({
+                    center: waypoints[0].coordinate,
+                    zoom: 15,
+                });
+                return;
+            }
+
+            const map = mapRef.getMap();
+
+            const {northEast, southWest} = utils.getBounds(waypoints.map((waypoint) => waypoint.coordinate));
+            map.fitBounds([northEast, southWest], {padding: mapPadding});
+        }, [waypoints, mapRef, mapPadding]);
+
+        useImperativeHandle(
+            ref,
+            () => ({
+                flyTo: (location: [number, number], zoomLevel: number = CONST.MAPBOX.DEFAULT_ZOOM, animationDuration?: number) =>
+                    mapRef?.flyTo({
+                        center: location,
+                        zoom: zoomLevel,
+                        duration: animationDuration,
+                    }),
+                fitBounds: (northEast: [number, number], southWest: [number, number]) => mapRef?.fitBounds([northEast, southWest]),
+            }),
+            [mapRef],
+        );
+
+        return (
+            <View
+                style={style}
+                // eslint-disable-next-line
+                {...responder.panHandlers}
+            >
+                <Map
+                    ref={setRef}
+                    mapboxAccessToken={accessToken}
+                    initialViewState={{
+                        longitude: initialState.location[0],
+                        latitude: initialState.location[1],
+                        zoom: initialState.zoom,
+                    }}
+                    mapStyle={styleURL}
+                >
+                    {waypoints?.map(({coordinate, markerComponent, id}) => {
+                        const MarkerComponent = markerComponent;
+                        return (
+                            <Marker
+                                key={id}
+                                longitude={coordinate[0]}
+                                latitude={coordinate[1]}
+                            >
+                                <MarkerComponent />
+                            </Marker>
+                        );
+                    })}
+                    {directionCoordinates && <Direction coordinates={directionCoordinates} />}
+                </Map>
+            </View>
+        );
+    },
+);
+
+export default MapView;
diff --git a/src/components/MapView/MapViewTypes.ts b/src/components/MapView/MapViewTypes.ts
new file mode 100644
index 000000000000..dc56cb4642c4
--- /dev/null
+++ b/src/components/MapView/MapViewTypes.ts
@@ -0,0 +1,66 @@
+import {ComponentType} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+type MapViewProps = {
+    // Public access token to be used to fetch map data from Mapbox.
+    accessToken: string;
+    // Style applied to MapView component. Note some of the View Style props are not available on ViewMap
+    style: StyleProp<ViewStyle>;
+    // Link to the style JSON document.
+    styleURL?: string;
+    // Whether map can tilt in the vertical direction.
+    pitchEnabled?: boolean;
+    // Padding to apply when the map is adjusted to fit waypoints and directions
+    mapPadding?: number;
+    // Initial coordinate and zoom level
+    initialState?: InitialState;
+    // Locations on which to put markers
+    waypoints?: WayPoint[];
+    // List of coordinates which together forms a direction.
+    directionCoordinates?: Array<[number, number]>;
+    // Callback to call when the map is idle / ready.
+    onMapReady?: () => void;
+};
+
+type DirectionProps = {
+    // Coordinates of points that constitute the direction
+    coordinates: Array<[number, number]>;
+};
+
+type PendingMapViewProps = {
+    /** Title message below the icon */
+    title?: string;
+
+    /** Subtitle message below the title */
+    subtitle?: string;
+};
+
+// Initial state of the map
+type InitialState = {
+    // Coordinate on which to center the map
+    location: [number, number];
+    zoom: number;
+};
+
+// Waypoint to be displayed on the map
+type WayPoint = {
+    id: string;
+    coordinate: [number, number];
+    markerComponent: ComponentType;
+};
+
+// Style used for the line that displays direction
+type DirectionStyle = {
+    width?: number;
+    color?: string;
+};
+
+// Represents a handle to interact with a map view.
+type MapViewHandle = {
+    // Fly to a location on the map
+    flyTo: (location: [number, number], zoomLevel: number, animationDuration?: number) => void;
+    // Fit the map view to a bounding box
+    fitBounds: (ne: [number, number], sw: [number, number], paddingConfig?: number | number[], animationDuration?: number) => void;
+};
+
+export type {DirectionStyle, WayPoint, MapViewProps, DirectionProps, PendingMapViewProps, MapViewHandle};
diff --git a/src/components/MapView/PendingMapView.tsx b/src/components/MapView/PendingMapView.tsx
new file mode 100644
index 000000000000..6a35d2a9c369
--- /dev/null
+++ b/src/components/MapView/PendingMapView.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {View} from 'react-native';
+import _ from 'lodash';
+import variables from '../../styles/variables';
+import styles from '../../styles/styles';
+import Icon from '../Icon';
+import {PendingMapViewProps} from './MapViewTypes';
+import BlockingView from '../BlockingViews/BlockingView';
+import * as Expensicons from '../Icon/Expensicons';
+
+function PendingMapView({title = '', subtitle = ''}: PendingMapViewProps) {
+    const hasTextContent = !_.isEmpty(title) || !_.isEmpty(subtitle);
+
+    return (
+        <View style={[styles.mapPendingView]}>
+            {hasTextContent ? (
+                <BlockingView
+                    icon={Expensicons.EmptyStateRoutePending}
+                    title={title}
+                    subtitle={subtitle}
+                    shouldShowLink={false}
+                />
+            ) : (
+                <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10]}>
+                    <Icon
+                        src={Expensicons.EmptyStateRoutePending}
+                        width={variables.iconSizeUltraLarge}
+                        height={variables.iconSizeUltraLarge}
+                    />
+                </View>
+            )}
+        </View>
+    );
+}
+
+export default PendingMapView;
diff --git a/src/components/MapView/index.js b/src/components/MapView/index.js
new file mode 100644
index 000000000000..551f57e34ed2
--- /dev/null
+++ b/src/components/MapView/index.js
@@ -0,0 +1,3 @@
+import MapView from './MapView';
+
+export default MapView;
diff --git a/src/components/MapView/responder/index.android.ts b/src/components/MapView/responder/index.android.ts
new file mode 100644
index 000000000000..a0fce71d8ef5
--- /dev/null
+++ b/src/components/MapView/responder/index.android.ts
@@ -0,0 +1,8 @@
+import {PanResponder} from 'react-native';
+
+const responder = PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
+    onPanResponderTerminationRequest: () => false,
+});
+
+export default responder;
diff --git a/src/components/MapView/responder/index.ios.ts b/src/components/MapView/responder/index.ios.ts
new file mode 100644
index 000000000000..5385a9ecc731
--- /dev/null
+++ b/src/components/MapView/responder/index.ios.ts
@@ -0,0 +1,5 @@
+const responder = {
+    panHandlers: {},
+};
+
+export default responder;
diff --git a/src/components/MapView/responder/index.ts b/src/components/MapView/responder/index.ts
new file mode 100644
index 000000000000..422d6c1b4963
--- /dev/null
+++ b/src/components/MapView/responder/index.ts
@@ -0,0 +1,8 @@
+import {PanResponder} from 'react-native';
+
+const responder = PanResponder.create({
+    onMoveShouldSetPanResponder: () => true,
+    onPanResponderTerminationRequest: () => false,
+});
+
+export default responder;
diff --git a/src/components/MapView/utils.ts b/src/components/MapView/utils.ts
new file mode 100644
index 000000000000..c37d272296e5
--- /dev/null
+++ b/src/components/MapView/utils.ts
@@ -0,0 +1,13 @@
+function getBounds(waypoints: Array<[number, number]>): {southWest: [number, number]; northEast: [number, number]} {
+    const lngs = waypoints.map((waypoint) => waypoint[0]);
+    const lats = waypoints.map((waypoint) => waypoint[1]);
+
+    return {
+        southWest: [Math.min(...lngs), Math.min(...lats)],
+        northEast: [Math.max(...lngs), Math.max(...lats)],
+    };
+}
+
+export default {
+    getBounds,
+};
diff --git a/src/components/MentionSuggestions.js b/src/components/MentionSuggestions.js
index 4b0129635269..11df8a597ded 100644
--- a/src/components/MentionSuggestions.js
+++ b/src/components/MentionSuggestions.js
@@ -3,6 +3,7 @@ import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import styles from '../styles/styles';
+import themeColors from '../styles/themes/default';
 import * as StyleUtils from '../styles/StyleUtils';
 import Text from './Text';
 import CONST from '../CONST';
@@ -79,7 +80,7 @@ function MentionSuggestions(props) {
                         size={isIcon ? CONST.AVATAR_SIZE.MENTION_ICON : CONST.AVATAR_SIZE.SMALLER}
                         name={item.icons[0].name}
                         type={item.icons[0].type}
-                        fill={styles.success}
+                        fill={themeColors.success}
                     />
                 </View>
                 <Text
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index e284244f694c..bb4eeb7a18ac 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
-import React from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Text from './Text';
 import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
@@ -14,7 +15,6 @@ import Badge from './Badge';
 import CONST from '../CONST';
 import menuItemPropTypes from './menuItemPropTypes';
 import SelectCircle from './SelectCircle';
-import colors from '../styles/colors';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
 import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
@@ -24,6 +24,11 @@ import variables from '../styles/variables';
 import * as Session from '../libs/actions/Session';
 import Hoverable from './Hoverable';
 import useWindowDimensions from '../hooks/useWindowDimensions';
+import RenderHTML from './RenderHTML';
+import getPlatform from '../libs/getPlatform';
+
+const platform = getPlatform();
+const isNative = platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID;
 
 const propTypes = menuItemPropTypes;
 
@@ -34,6 +39,7 @@ const defaultProps = {
     shouldShowBasicTitle: false,
     shouldShowDescriptionOnTop: false,
     shouldShowHeaderTitle: false,
+    shouldParseTitle: false,
     wrapperStyle: [],
     style: styles.popoverMenuItem,
     titleStyle: {},
@@ -54,6 +60,7 @@ const defaultProps = {
     disabled: false,
     isSelected: false,
     subtitle: undefined,
+    subtitleTextStyle: {},
     iconType: CONST.ICON_TYPE_ICON,
     onPress: () => {},
     onSecondaryInteraction: undefined,
@@ -73,10 +80,12 @@ const defaultProps = {
     title: '',
     numberOfLinesTitle: 1,
     shouldGreyOutWhenDisabled: true,
+    shouldRenderAsHTML: false,
 };
 
 const MenuItem = React.forwardRef((props, ref) => {
     const {isSmallScreenWidth} = useWindowDimensions();
+    const [html, setHtml] = React.useState('');
 
     const isDeleted = _.contains(props.style, styles.offlineFeedback.deleted);
     const descriptionVerticalMargin = props.shouldShowDescriptionOnTop ? styles.mb1 : styles.mt1;
@@ -104,6 +113,28 @@ const MenuItem = React.forwardRef((props, ref) => {
 
     const fallbackAvatarSize = props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT;
 
+    const titleRef = React.useRef('');
+    useEffect(() => {
+        if (!props.title || (titleRef.current.length && titleRef.current === props.title) || !props.shouldParseTitle) {
+            return;
+        }
+        const parser = new ExpensiMark();
+        setHtml(parser.replace(convertToLTR(props.title)));
+        titleRef.current = props.title;
+    }, [props.title, props.shouldParseTitle]);
+
+    const getProcessedTitle = useMemo(() => {
+        if (props.shouldRenderAsHTML) {
+            return convertToLTR(props.title);
+        }
+
+        if (props.shouldParseTitle) {
+            return html;
+        }
+
+        return '';
+    }, [props.title, props.shouldRenderAsHTML, props.shouldParseTitle, html]);
+
     return (
         <Hoverable>
             {(isHovered) => (
@@ -220,10 +251,20 @@ const MenuItem = React.forwardRef((props, ref) => {
                                             </Text>
                                         )}
                                         <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                            {Boolean(props.title) && (
+                                            {Boolean(props.title) &&
+                                                (Boolean(props.shouldRenderAsHTML) || (Boolean(props.shouldParseTitle) && Boolean(html.length))) &&
+                                                (isNative ? (
+                                                    <RenderHTML html={getProcessedTitle} />
+                                                ) : (
+                                                    <View style={styles.chatItemMessage}>
+                                                        <RenderHTML html={getProcessedTitle} />
+                                                    </View>
+                                                ))}
+                                            {!props.shouldRenderAsHTML && !html.length && Boolean(props.title) && (
                                                 <Text
                                                     style={titleTextStyle}
                                                     numberOfLines={props.numberOfLinesTitle || undefined}
+                                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: props.interactive && props.disabled}}
                                                 >
                                                     {convertToLTR(props.title)}
                                                 </Text>
@@ -278,7 +319,7 @@ const MenuItem = React.forwardRef((props, ref) => {
                                 {/* Since subtitle can be of type number, we should allow 0 to be shown */}
                                 {(props.subtitle || props.subtitle === 0) && (
                                     <View style={[styles.justifyContentCenter, styles.mr1]}>
-                                        <Text style={[styles.textLabelSupporting, props.style]}>{props.subtitle}</Text>
+                                        <Text style={[props.subtitleTextStyle || styles.textLabelSupporting, props.style]}>{props.subtitle}</Text>
                                     </View>
                                 )}
                                 {!_.isEmpty(props.floatRightAvatars) && (
@@ -297,7 +338,7 @@ const MenuItem = React.forwardRef((props, ref) => {
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.ml1]}>
                                         <Icon
                                             src={Expensicons.DotIndicator}
-                                            fill={props.brickRoadIndicator === 'error' ? colors.red : colors.green}
+                                            fill={props.brickRoadIndicator === 'error' ? themeColors.danger : themeColors.success}
                                         />
                                     </View>
                                 )}
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index ab9d420f949c..051c4ba3f80a 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -1,4 +1,4 @@
-import React, {forwardRef, useCallback, useEffect, useMemo} from 'react';
+import React, {forwardRef, useCallback, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ReactNativeModal from 'react-native-modal';
@@ -13,6 +13,8 @@ import useWindowDimensions from '../../hooks/useWindowDimensions';
 import variables from '../../styles/variables';
 import CONST from '../../CONST';
 import ComposerFocusManager from '../../libs/ComposerFocusManager';
+import useNativeDriver from '../../libs/useNativeDriver';
+import usePrevious from '../../hooks/usePrevious';
 
 const propTypes = {
     ...modalPropTypes,
@@ -40,7 +42,7 @@ function BaseModal({
     fullscreen,
     animationIn,
     animationOut,
-    useNativeDriver,
+    useNativeDriver: useNativeDriverProp,
     hideModalContentWhileAnimating,
     animationInTiming,
     animationOutTiming,
@@ -54,6 +56,9 @@ function BaseModal({
 
     const safeAreaInsets = useSafeAreaInsets();
 
+    const isVisibleRef = useRef(isVisible);
+    const wasVisible = usePrevious(isVisible);
+
     /**
      * Hides modal
      * @param {Boolean} [callHideCallback=true] Should we call the onModalHide callback
@@ -75,20 +80,25 @@ function BaseModal({
     );
 
     useEffect(() => {
-        Modal.willAlertModalBecomeVisible(isVisible);
-
-        // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
-        Modal.setCloseModal(isVisible ? onClose : null);
-    }, [isVisible, onClose]);
+        isVisibleRef.current = isVisible;
+        if (isVisible) {
+            Modal.willAlertModalBecomeVisible(true);
+            // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
+            Modal.setCloseModal(onClose);
+        } else if (wasVisible && !isVisible) {
+            Modal.willAlertModalBecomeVisible(false);
+            Modal.setCloseModal(null);
+        }
+    }, [isVisible, wasVisible, onClose]);
 
     useEffect(
         () => () => {
             // Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
-            if (isVisible) {
-                hideModal(true);
-                Modal.willAlertModalBecomeVisible(false);
+            if (!isVisibleRef.current) {
+                return;
             }
-
+            hideModal(true);
+            Modal.willAlertModalBecomeVisible(false);
             // To prevent closing any modal already unmounted when this modal still remains as visible state
             Modal.setCloseModal(null);
         },
@@ -187,7 +197,7 @@ function BaseModal({
             deviceWidth={windowWidth}
             animationIn={animationIn || modalStyleAnimationIn}
             animationOut={animationOut || modalStyleAnimationOut}
-            useNativeDriver={useNativeDriver}
+            useNativeDriver={useNativeDriverProp && useNativeDriver}
             hideModalContentWhileAnimating={hideModalContentWhileAnimating}
             animationInTiming={animationInTiming}
             animationOutTiming={animationOutTiming}
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 7e6cc78ebd13..d78f289f184b 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -69,8 +69,8 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(
-        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0,
-        [isPayer, isSettled, moneyRequestReport, reportTotal],
+        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0 && !ReportUtils.isArchivedRoom(chatReport),
+        [isPayer, isSettled, moneyRequestReport, reportTotal, chatReport],
     );
     const shouldShowApproveButton = useMemo(() => {
         if (policyType !== CONST.POLICY.TYPE.CORPORATE) {
@@ -79,7 +79,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
         return isManager && !isApproved && !isSettled;
     }, [policyType, isManager, isApproved, isSettled]);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
-    const shouldShowPaypal = Boolean(lodashGet(personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
 
     return (
@@ -99,7 +98,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                         <SettlementButton
                             currency={moneyRequestReport.currency}
                             policyID={moneyRequestReport.policyID}
-                            shouldShowPaypal={shouldShowPaypal}
                             chatReportID={chatReport.reportID}
                             iouReport={moneyRequestReport}
                             onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
@@ -128,7 +126,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     <SettlementButton
                         currency={moneyRequestReport.currency}
                         policyID={moneyRequestReport.policyID}
-                        shouldShowPaypal={shouldShowPaypal}
                         chatReportID={moneyRequestReport.chatReportID}
                         iouReport={moneyRequestReport}
                         onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 489e860d7102..da4e8d69682a 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -1,12 +1,15 @@
-import React, {useCallback, useMemo, useReducer, useState} from 'react';
+import React, {useCallback, useMemo, useReducer, useState, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import {format} from 'date-fns';
 import _ from 'underscore';
 import {View} from 'react-native';
+import lodashGet from 'lodash/get';
+import Text from './Text';
 import styles from '../styles/styles';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
+import Permissions from '../libs/Permissions';
 import OptionsSelector from './OptionsSelector';
 import ONYXKEYS from '../ONYXKEYS';
 import compose from '../libs/compose';
@@ -28,6 +31,13 @@ import Image from './Image';
 import useLocalize from '../hooks/useLocalize';
 import * as ReceiptUtils from '../libs/ReceiptUtils';
 import categoryPropTypes from './categoryPropTypes';
+import Switch from './Switch';
+import tagPropTypes from './tagPropTypes';
+import ConfirmedRoute from './ConfirmedRoute';
+import transactionPropTypes from './transactionPropTypes';
+import DistanceRequestUtils from '../libs/DistanceRequestUtils';
+import * as IOU from '../libs/actions/IOU';
+import * as TransactionUtils from '../libs/TransactionUtils';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -63,6 +73,9 @@ const propTypes = {
     /** IOU Category */
     iouCategory: PropTypes.string,
 
+    /** IOU Tag */
+    iouTag: PropTypes.string,
+
     /** Selected participants from MoneyRequestModal with login / accountID */
     selectedParticipants: PropTypes.arrayOf(optionPropTypes).isRequired,
 
@@ -85,6 +98,9 @@ const propTypes = {
         email: PropTypes.string.isRequired,
     }),
 
+    /** List of betas available to current user */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
     /** The policyID of the request */
     policyID: PropTypes.string,
 
@@ -97,9 +113,42 @@ const propTypes = {
     /** File source of the receipt */
     receiptSource: PropTypes.string,
 
+    /** List styles for OptionsSelector */
+    listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
+    /** ID of the transaction that represents the money request */
+    transactionID: PropTypes.string,
+
+    /** Transaction that represents the money request */
+    transaction: transactionPropTypes,
+
+    /** Unit and rate used for if the money request is a distance request */
+    mileageRate: PropTypes.shape({
+        /** Unit used to represent distance */
+        unit: PropTypes.oneOf([CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]),
+
+        /** Rate used to calculate the distance request amount */
+        rate: PropTypes.number,
+
+        /** The currency of the rate */
+        currency: PropTypes.string,
+    }),
+
+    /** Whether the money request is a distance request */
+    isDistanceRequest: PropTypes.bool,
+
     /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            required: PropTypes.bool,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
 };
 
 const defaultProps = {
@@ -108,6 +157,7 @@ const defaultProps = {
     onSelectParticipant: () => {},
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     iouCategory: '',
+    iouTag: '',
     payeePersonalDetails: null,
     canModifyParticipants: false,
     isReadOnly: false,
@@ -115,24 +165,61 @@ const defaultProps = {
     session: {
         email: null,
     },
+    betas: [],
     policyID: '',
     reportID: '',
     ...withCurrentUserPersonalDetailsDefaultProps,
     receiptPath: '',
     receiptSource: '',
+    listStyles: [],
     policyCategories: {},
+    policyTags: {},
+    transactionID: '',
+    transaction: {},
+    mileageRate: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate: 0, currency: 'USD'},
+    isDistanceRequest: false,
 };
 
 function MoneyRequestConfirmationList(props) {
     // Destructure functions from props to pass it as a dependecy to useCallback/useMemo hooks.
     // Prop functions pass props itself as a "this" value to the function which means they change every time props change.
-    const {onSendMoney, onConfirm, onSelectParticipant} = props;
+    const {onSendMoney, onConfirm, onSelectParticipant, transaction} = props;
     const {translate} = useLocalize();
 
     // A flag and a toggler for showing the rest of the form fields
-    const [showAllFields, toggleShowAllFields] = useReducer((state) => !state, false);
+    const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
+    const shouldShowAllFields = props.isDistanceRequest || shouldExpandFields;
     const isTypeRequest = props.iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST;
 
+    const {unit, rate, currency} = props.mileageRate;
+    const distance = lodashGet(transaction, 'routes.route0.distance', 0);
+    const shouldCalculateDistanceAmount = props.isDistanceRequest && props.iouAmount === 0;
+    const shouldCategoryBeEditable = !_.isEmpty(props.policyCategories) && Permissions.canUseCategories(props.betas);
+
+    // Fetches the first tag list of the policy
+    const tagListKey = _.first(_.keys(props.policyTags));
+    const tagList = lodashGet(props.policyTags, [tagListKey, 'tags'], []);
+    const tagListName = lodashGet(props.policyTags, [tagListKey, 'name'], '');
+    const canUseTags = Permissions.canUseTags(props.betas);
+
+    const hasRoute = TransactionUtils.hasRoute(transaction);
+    const isDistanceRequestWithoutRoute = props.isDistanceRequest && !hasRoute;
+    const formattedAmount = isDistanceRequestWithoutRoute
+        ? translate('common.tbd')
+        : CurrencyUtils.convertToDisplayString(
+              shouldCalculateDistanceAmount ? DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate) : props.iouAmount,
+              props.isDistanceRequest ? currency : props.iouCurrencyCode,
+          );
+
+    useEffect(() => {
+        if (!shouldCalculateDistanceAmount) {
+            return;
+        }
+
+        const amount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate);
+        IOU.setMoneyRequestAmount(amount);
+    }, [shouldCalculateDistanceAmount, distance, rate, unit]);
+
     /**
      * Returns the participants with amount
      * @param {Array} participants
@@ -150,11 +237,11 @@ function MoneyRequestConfirmationList(props) {
 
     const splitOrRequestOptions = useMemo(() => {
         let text;
-        if (props.receiptPath) {
+        if (props.receiptPath || isDistanceRequestWithoutRoute) {
             text = translate('iou.request');
         } else {
             const translationKey = props.hasMultipleParticipants ? 'iou.splitAmount' : 'iou.requestAmount';
-            text = translate(translationKey, {amount: CurrencyUtils.convertToDisplayString(props.iouAmount, props.iouCurrencyCode)});
+            text = translate(translationKey, {amount: formattedAmount});
         }
         return [
             {
@@ -162,7 +249,7 @@ function MoneyRequestConfirmationList(props) {
                 value: props.hasMultipleParticipants ? CONST.IOU.MONEY_REQUEST_TYPE.SPLIT : CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
             },
         ];
-    }, [props.hasMultipleParticipants, props.iouAmount, props.receiptPath, props.iouCurrencyCode, translate]);
+    }, [props.hasMultipleParticipants, props.receiptPath, translate, formattedAmount, isDistanceRequestWithoutRoute]);
 
     const selectedParticipants = useMemo(() => _.filter(props.selectedParticipants, (participant) => participant.selected), [props.selectedParticipants]);
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
@@ -237,6 +324,14 @@ function MoneyRequestConfirmationList(props) {
         return [...selectedParticipants, OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails)];
     }, [selectedParticipants, props.hasMultipleParticipants, payeePersonalDetails]);
 
+    useEffect(() => {
+        if (!props.isDistanceRequest) {
+            return;
+        }
+        const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate, currency, translate);
+        IOU.setMoneyRequestMerchant(distanceMerchant);
+    }, [hasRoute, distance, unit, rate, currency, translate, props.isDistanceRequest]);
+
     /**
      * @param {Object} option
      */
@@ -290,8 +385,6 @@ function MoneyRequestConfirmationList(props) {
         [selectedParticipants, onSendMoney, onConfirm, props.iouType],
     );
 
-    const formattedAmount = CurrencyUtils.convertToDisplayString(props.iouAmount, props.iouCurrencyCode);
-
     const footerContent = useMemo(() => {
         if (props.isReadOnly) {
             return;
@@ -299,13 +392,11 @@ function MoneyRequestConfirmationList(props) {
 
         const shouldShowSettlementButton = props.iouType === CONST.IOU.MONEY_REQUEST_TYPE.SEND;
         const shouldDisableButton = selectedParticipants.length === 0;
-        const recipient = props.selectedParticipants[0] || {};
 
         return shouldShowSettlementButton ? (
             <SettlementButton
                 isDisabled={shouldDisableButton}
                 onPress={confirm}
-                shouldShowPaypal={Boolean(recipient && recipient.payPalMeAddress)}
                 enablePaymentsRoute={ROUTES.IOU_SEND_ENABLE_PAYMENTS}
                 addBankAccountRoute={props.bankAccountRoute}
                 addDebitCardRoute={ROUTES.IOU_SEND_ADD_DEBIT_CARD}
@@ -326,7 +417,7 @@ function MoneyRequestConfirmationList(props) {
                 buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
             />
         );
-    }, [confirm, props.selectedParticipants, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
+    }, [confirm, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
 
     return (
         <OptionsSelector
@@ -344,7 +435,13 @@ function MoneyRequestConfirmationList(props) {
             shouldUseStyleForChildren={false}
             optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}}
             footerContent={footerContent}
+            listStyles={props.listStyles}
         >
+            {props.isDistanceRequest && (
+                <View style={styles.confirmationListMapItem}>
+                    <ConfirmedRoute transactionID={props.transactionID} />
+                </View>
+            )}
             {!_.isEmpty(props.receiptPath) ? (
                 <Image
                     style={styles.moneyRequestImage}
@@ -352,10 +449,10 @@ function MoneyRequestConfirmationList(props) {
                 />
             ) : (
                 <MenuItemWithTopDescription
-                    shouldShowRightIcon={!props.isReadOnly}
+                    shouldShowRightIcon={!props.isReadOnly && !props.isDistanceRequest}
                     title={formattedAmount}
                     description={translate('iou.amount')}
-                    onPress={() => Navigation.navigate(ROUTES.getMoneyRequestAmountRoute(props.iouType, props.reportID))}
+                    onPress={() => !props.isDistanceRequest && Navigation.navigate(ROUTES.getMoneyRequestAmountRoute(props.iouType, props.reportID))}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
                     titleStyle={styles.moneyRequestConfirmationAmount}
                     disabled={didConfirm || props.isReadOnly}
@@ -363,6 +460,7 @@ function MoneyRequestConfirmationList(props) {
             )}
             <MenuItemWithTopDescription
                 shouldShowRightIcon={!props.isReadOnly}
+                shouldParseTitle
                 title={props.iouComment}
                 description={translate('common.description')}
                 onPress={() => Navigation.navigate(ROUTES.getMoneyRequestDescriptionRoute(props.iouType, props.reportID))}
@@ -371,12 +469,12 @@ function MoneyRequestConfirmationList(props) {
                 disabled={didConfirm || props.isReadOnly}
                 numberOfLinesTitle={2}
             />
-            {!showAllFields && (
+            {!shouldShowAllFields && (
                 <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter, styles.mb2]}>
                     <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.mr0]} />
                     <Button
                         small
-                        onPress={toggleShowAllFields}
+                        onPress={toggleShouldExpandFields}
                         text={translate('common.showMore')}
                         shouldShowRightIcon
                         iconRight={Expensicons.DownArrow}
@@ -386,7 +484,7 @@ function MoneyRequestConfirmationList(props) {
                     <View style={[styles.shortTermsHorizontalRule, styles.flex1, styles.ml0]} />
                 </View>
             )}
-            {showAllFields && (
+            {shouldShowAllFields && (
                 <>
                     <MenuItemWithTopDescription
                         shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
@@ -397,16 +495,28 @@ function MoneyRequestConfirmationList(props) {
                         onPress={() => Navigation.navigate(ROUTES.getMoneyRequestCreatedRoute(props.iouType, props.reportID))}
                         disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                     />
-                    <MenuItemWithTopDescription
-                        shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
-                        title={props.iouMerchant}
-                        description={translate('common.merchant')}
-                        style={[styles.moneyRequestMenuItem, styles.mb2]}
-                        titleStyle={styles.flex1}
-                        onPress={() => Navigation.navigate(ROUTES.getMoneyRequestMerchantRoute(props.iouType, props.reportID))}
-                        disabled={didConfirm || props.isReadOnly || !isTypeRequest}
-                    />
-                    {!_.isEmpty(props.policyCategories) && (
+                    {props.isDistanceRequest ? (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
+                            title={props.iouMerchant}
+                            description={translate('common.distance')}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            titleStyle={styles.flex1}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestAddressRoute(props.iouType, props.reportID))}
+                            disabled={didConfirm || props.isReadOnly || !isTypeRequest}
+                        />
+                    ) : (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
+                            title={props.iouMerchant}
+                            description={translate('common.merchant')}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            titleStyle={styles.flex1}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestMerchantRoute(props.iouType, props.reportID))}
+                            disabled={didConfirm || props.isReadOnly || !isTypeRequest}
+                        />
+                    )}
+                    {shouldCategoryBeEditable && (
                         <MenuItemWithTopDescription
                             shouldShowRightIcon={!props.isReadOnly}
                             title={props.iouCategory}
@@ -416,6 +526,26 @@ function MoneyRequestConfirmationList(props) {
                             disabled={didConfirm || props.isReadOnly}
                         />
                     )}
+                    {canUseTags && !!tagList && (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly}
+                            title={props.iouTag}
+                            description={tagListName || translate('common.tag')}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestTagRoute(props.iouType, props.reportID))}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            disabled={didConfirm || props.isReadOnly}
+                        />
+                    )}
+                    {canUseTags && !lodashGet(props.policy, 'disabledFields.defaultBillable', true) && (
+                        <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
+                            <Text color={!props.iouIsBillable ? themeColors.textSupporting : undefined}>{translate('common.billable')}</Text>
+                            <Switch
+                                accessibilityLabel={translate('common.billable')}
+                                isOn={props.iouIsBillable}
+                                onToggle={props.onToggleBillable}
+                            />
+                        </View>
+                    )}
                 </>
             )}
         </OptionsSelector>
@@ -431,8 +561,24 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
         policyCategories: {
             key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
         },
+        policyTags: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+        },
+        mileageRate: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            selector: DistanceRequestUtils.getDefaultMileageRate,
+        },
+        transaction: {
+            key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        },
+        policy: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+        },
     }),
 )(MoneyRequestConfirmationList);
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index f04a41ae1153..7f1e58912128 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -9,25 +9,22 @@ import * as ReportUtils from '../libs/ReportUtils';
 import * as Expensicons from './Icon/Expensicons';
 import participantPropTypes from './participantPropTypes';
 import styles from '../styles/styles';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
-import compose from '../libs/compose';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
 import ONYXKEYS from '../ONYXKEYS';
 import * as IOU from '../libs/actions/IOU';
-import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import ConfirmModal from './ConfirmModal';
 import useLocalize from '../hooks/useLocalize';
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import * as TransactionUtils from '../libs/TransactionUtils';
+import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
+import transactionPropTypes from './transactionPropTypes';
+import useWindowDimensions from '../hooks/useWindowDimensions';
 
 const propTypes = {
     /** The report currently being looked at */
     report: iouReportPropTypes.isRequired,
 
-    /** The expense report or iou report (only will have a value if this is a transaction thread) */
-    parentReport: iouReportPropTypes,
-
     /** The policy which the report is tied to */
     policy: PropTypes.shape({
         /** Name of the policy */
@@ -37,13 +34,21 @@ const propTypes = {
     /** Personal details so we can get the ones for the report participants */
     personalDetails: PropTypes.objectOf(participantPropTypes).isRequired,
 
+    /* Onyx Props */
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
         /** Currently logged in user email */
         email: PropTypes.string,
     }),
 
-    ...windowDimensionsPropTypes,
+    /** The expense report or iou report (only will have a value if this is a transaction thread) */
+    parentReport: iouReportPropTypes,
+
+    /** The report action the transaction is tied to from the parent report */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
+    /** All the data for the transaction */
+    transaction: transactionPropTypes,
 };
 
 const defaultProps = {
@@ -51,28 +56,25 @@ const defaultProps = {
         email: null,
     },
     parentReport: {},
+    parentReportAction: {},
+    transaction: {},
 };
 
-function MoneyRequestHeader(props) {
+function MoneyRequestHeader({session, parentReport, report, parentReportAction, transaction, policy, personalDetails}) {
     const {translate} = useLocalize();
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-    const moneyRequestReport = props.parentReport;
+    const moneyRequestReport = parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-
-    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
 
     // Only the requestor can take delete the request, admins can only edit it.
-    const isActionOwner = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
-    const report = props.report;
-    report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
-    report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
+    const isActionOwner = lodashGet(parentReportAction, 'actorAccountID') === lodashGet(session, 'accountID', null);
 
     const deleteTransaction = useCallback(() => {
-        IOU.deleteMoneyRequest(parentReportAction.originalMessage.IOUTransactionID, parentReportAction, true);
+        IOU.deleteMoneyRequest(lodashGet(parentReportAction, 'originalMessage.IOUTransactionID'), parentReportAction, true);
         setIsDeleteModalVisible(false);
     }, [parentReportAction, setIsDeleteModalVisible]);
 
-    const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
 
     return (
@@ -89,11 +91,15 @@ function MoneyRequestHeader(props) {
                             onSelected: () => setIsDeleteModalVisible(true),
                         },
                     ]}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(props.windowWidth)}
-                    report={report}
-                    policy={props.policy}
-                    personalDetails={props.personalDetails}
-                    shouldShowBackButton={props.isSmallScreenWidth}
+                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                    report={{
+                        ...report,
+                        ownerAccountID: lodashGet(parentReport, 'ownerAccountID', null),
+                        ownerEmail: lodashGet(parentReport, 'ownerEmail', null),
+                    }}
+                    policy={policy}
+                    personalDetails={personalDetails}
+                    shouldShowBackButton={isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
                 />
                 {isScanning && <MoneyRequestHeaderStatusBar />}
@@ -116,14 +122,19 @@ MoneyRequestHeader.displayName = 'MoneyRequestHeader';
 MoneyRequestHeader.propTypes = propTypes;
 MoneyRequestHeader.defaultProps = defaultProps;
 
-export default compose(
-    withWindowDimensions,
-    withOnyx({
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-        parentReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
-        },
-    }),
-)(MoneyRequestHeader);
+export default withOnyx({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+    parentReport: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+    },
+    parentReportAction: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${(report.parentReportID, report.parentReportActionID)}`,
+        selector: (reportActions, props) => props && props.parentReport && reportActions && reportActions[props.parentReport.parentReportActionID],
+        canEvict: false,
+    },
+    transaction: {
+        key: ({parentReportAction}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportAction, 'originalMessage.IOUTransactionID', 0)}`,
+    },
+})(MoneyRequestHeader);
diff --git a/src/components/MoneyRequestHeaderStatusBar.js b/src/components/MoneyRequestHeaderStatusBar.js
index 488c122ce5bc..a4f21e3d168d 100644
--- a/src/components/MoneyRequestHeaderStatusBar.js
+++ b/src/components/MoneyRequestHeaderStatusBar.js
@@ -8,20 +8,7 @@ function MoneyRequestHeaderStatusBar() {
     const {translate} = useLocalize();
 
     return (
-        <View
-            style={[
-                styles.dFlex,
-                styles.flexRow,
-                styles.alignItemsCenter,
-                styles.flexGrow1,
-                styles.justifyContentBetween,
-                styles.overflowHidden,
-                styles.ph5,
-                styles.pv3,
-                styles.borderBottom,
-                styles.w100,
-            ]}
-        >
+        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.overflowHidden, styles.ph5, styles.pb3, styles.borderBottom, styles.w100]}>
             <View style={[styles.moneyRequestHeaderStatusBarBadge]}>
                 <Text style={[styles.textStrong, styles.textLabel]}>{translate('iou.receiptStatusTitle')}</Text>
             </View>
diff --git a/src/components/MoneyRequestSkeletonView.js b/src/components/MoneyRequestSkeletonView.js
new file mode 100644
index 000000000000..50a7b56b91e3
--- /dev/null
+++ b/src/components/MoneyRequestSkeletonView.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import {Rect} from 'react-native-svg';
+import SkeletonViewContentLoader from 'react-content-loader/native';
+import variables from '../styles/variables';
+import themeColors from '../styles/themes/default';
+import styles from '../styles/styles';
+
+function MoneyRequestSkeletonView() {
+    return (
+        <SkeletonViewContentLoader
+            animate
+            width={styles.w100.width}
+            height={variables.moneyRequestSkeletonHeight}
+            backgroundColor={themeColors.borderLighter}
+            foregroundColor={themeColors.border}
+        >
+            <Rect
+                x="16"
+                y="20"
+                width="40"
+                height="8"
+            />
+            <Rect
+                x="16"
+                y="46"
+                width="120"
+                height="20"
+            />
+            <Rect
+                x="16"
+                y="78"
+                width="80"
+                height="8"
+            />
+        </SkeletonViewContentLoader>
+    );
+}
+
+MoneyRequestSkeletonView.displayName = 'MoneyRequestSkeletonView';
+export default MoneyRequestSkeletonView;
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js
index 4c6ba1307fb7..916646b5619a 100644
--- a/src/components/MultipleAvatars.js
+++ b/src/components/MultipleAvatars.js
@@ -221,6 +221,7 @@ function MultipleAvatars(props) {
                                         <Text
                                             selectable={false}
                                             style={[styles.avatarInnerTextSmall, StyleUtils.getAvatarExtraFontSizeStyle(props.size)]}
+                                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                         >{`+${avatars.length - props.maxAvatarsInRow}`}</Text>
                                     </View>
                                 </View>
@@ -278,6 +279,7 @@ function MultipleAvatars(props) {
                                         <Text
                                             selectable={false}
                                             style={props.size === CONST.AVATAR_SIZE.SMALL ? styles.avatarInnerTextSmall : styles.avatarInnerText}
+                                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                         >
                                             {`+${props.icons.length - 1}`}
                                         </Text>
diff --git a/src/components/NewDatePicker/CalendarPicker/index.js b/src/components/NewDatePicker/CalendarPicker/index.js
index fe0c36d32e41..1e1ef3c3fad3 100644
--- a/src/components/NewDatePicker/CalendarPicker/index.js
+++ b/src/components/NewDatePicker/CalendarPicker/index.js
@@ -130,7 +130,10 @@ class CalendarPicker extends React.PureComponent {
 
         return (
             <View>
-                <View style={[styles.calendarHeader, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ph4, styles.pr1]}>
+                <View
+                    style={[styles.calendarHeader, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ph4, styles.pr1]}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                >
                     <PressableWithFeedback
                         onPress={() => this.setState({isYearPickerVisible: true})}
                         style={[styles.alignItemsCenter, styles.flexRow, styles.flex1, styles.justifyContentStart]}
@@ -186,6 +189,7 @@ class CalendarPicker extends React.PureComponent {
                         <View
                             key={dayOfWeek}
                             style={[styles.calendarDayRoot, styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             <Text style={styles.sidebarLinkTextBold}>{dayOfWeek[0]}</Text>
                         </View>
@@ -212,6 +216,7 @@ class CalendarPicker extends React.PureComponent {
                                     accessibilityLabel={day ? day.toString() : undefined}
                                     focusable={Boolean(day)}
                                     accessible={Boolean(day)}
+                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                 >
                                     {({hovered, pressed}) => (
                                         <View
diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js
index 2f99b21b6523..dae170dd1d5c 100644
--- a/src/components/OfflineWithFeedback.js
+++ b/src/components/OfflineWithFeedback.js
@@ -2,11 +2,7 @@ import _ from 'underscore';
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import compose from '../libs/compose';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import {withNetwork} from './OnyxProvider';
 import CONST from '../CONST';
-import networkPropTypes from './networkPropTypes';
 import stylePropTypes from '../styles/stylePropTypes';
 import styles from '../styles/styles';
 import Tooltip from './Tooltip';
@@ -16,6 +12,8 @@ import * as StyleUtils from '../styles/StyleUtils';
 import DotIndicatorMessage from './DotIndicatorMessage';
 import shouldRenderOffscreen from '../libs/shouldRenderOffscreen';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import useLocalize from '../hooks/useLocalize';
+import useNetwork from '../hooks/useNetwork';
 
 /**
  * This component should be used when we are using the offline pattern B (offline with feedback).
@@ -37,15 +35,15 @@ const propTypes = {
     /** Whether we should show the error messages */
     shouldShowErrorMessages: PropTypes.bool,
 
+    /** Whether we should disable opacity */
+    shouldDisableOpacity: PropTypes.bool,
+
     /** A function to run when the X button next to the error is clicked */
     onClose: PropTypes.func,
 
     /** The content that needs offline feedback */
     children: PropTypes.node.isRequired,
 
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** Additional styles to add after local styles. Applied to the parent container */
     style: stylePropTypes,
 
@@ -55,7 +53,11 @@ const propTypes = {
     /** Additional style object for the error row */
     errorRowStyles: stylePropTypes,
 
-    ...withLocalizePropTypes,
+    /** Whether applying strikethrough to the children should be disabled */
+    shouldDisableStrikeThrough: PropTypes.bool,
+
+    /** Whether to apply needsOffscreenAlphaCompositing prop to the children */
+    needsOffscreenAlphaCompositing: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -63,10 +65,13 @@ const defaultProps = {
     shouldHideOnDelete: true,
     errors: null,
     shouldShowErrorMessages: true,
+    shouldDisableOpacity: false,
     onClose: () => {},
     style: [],
     contentContainerStyle: [],
     errorRowStyles: [],
+    shouldDisableStrikeThrough: false,
+    needsOffscreenAlphaCompositing: false,
 };
 
 /**
@@ -88,17 +93,20 @@ function applyStrikeThrough(children) {
 }
 
 function OfflineWithFeedback(props) {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+
     const hasErrors = !_.isEmpty(props.errors);
 
     // Some errors have a null message. This is used to apply opacity only and to avoid showing redundant messages.
     const errorMessages = _.omit(props.errors, (e) => e === null);
     const hasErrorMessages = !_.isEmpty(errorMessages);
-    const isOfflinePendingAction = props.network.isOffline && props.pendingAction;
+    const isOfflinePendingAction = isOffline && props.pendingAction;
     const isUpdateOrDeleteError = hasErrors && (props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
     const isAddError = hasErrors && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-    const needsOpacity = (isOfflinePendingAction && !isUpdateOrDeleteError) || isAddError;
-    const needsStrikeThrough = props.network.isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const hideChildren = props.shouldHideOnDelete && !props.network.isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !hasErrors;
+    const needsOpacity = !props.shouldDisableOpacity && ((isOfflinePendingAction && !isUpdateOrDeleteError) || isAddError);
+    const needsStrikeThrough = !props.shouldDisableStrikeThrough && isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    const hideChildren = props.shouldHideOnDelete && !isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !hasErrors;
     let children = props.children;
 
     // Apply strikethrough to children if needed, but skip it if we are not going to render them
@@ -122,12 +130,12 @@ function OfflineWithFeedback(props) {
                         messages={errorMessages}
                         type="error"
                     />
-                    <Tooltip text={props.translate('common.close')}>
+                    <Tooltip text={translate('common.close')}>
                         <PressableWithoutFeedback
                             onPress={props.onClose}
                             style={[styles.touchableButtonImage]}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                            accessibilityLabel={props.translate('common.close')}
+                            accessibilityLabel={translate('common.close')}
                         >
                             <Icon src={Expensicons.Close} />
                         </PressableWithoutFeedback>
@@ -142,4 +150,4 @@ OfflineWithFeedback.propTypes = propTypes;
 OfflineWithFeedback.defaultProps = defaultProps;
 OfflineWithFeedback.displayName = 'OfflineWithFeedback';
 
-export default compose(withLocalize, withNetwork())(OfflineWithFeedback);
+export default OfflineWithFeedback;
diff --git a/src/components/Onfido/index.css b/src/components/Onfido/index.css
index 7e05cce7d49d..5c76f42037a5 100644
--- a/src/components/Onfido/index.css
+++ b/src/components/Onfido/index.css
@@ -46,4 +46,11 @@
          spacing makes room for the header without cutting off the bottom of the Onfido window. */
         height: 92% !important;
     }
-}
+
+    /* 
+    * Solves issue with height not working for `onfido-sdk-ui-Modal-inner` container when device width is in between 490 - 600pixels.
+    */
+    #onfido-mount {
+        height: 100%;
+    }
+}
\ No newline at end of file
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index adaa4457bbd9..a07510f7603d 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -8,6 +8,7 @@ import * as StyleUtils from '../styles/StyleUtils';
 import optionPropTypes from './optionPropTypes';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
+import Button from './Button';
 import MultipleAvatars from './MultipleAvatars';
 import Hoverable from './Hoverable';
 import DisplayNames from './DisplayNames';
@@ -39,6 +40,18 @@ const propTypes = {
     /** Whether we should show the selected state */
     showSelectedState: PropTypes.bool,
 
+    /** Whether to show a button pill instead of a tickbox */
+    shouldShowSelectedStateAsButton: PropTypes.bool,
+
+    /** Text for button pill */
+    selectedStateButtonText: PropTypes.string,
+
+    /** Callback to fire when the multiple selector (tickbox or button) is clicked */
+    onSelectedStatePressed: PropTypes.func,
+
+    /** Whether we highlight selected option */
+    highlightSelected: PropTypes.bool,
+
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
@@ -57,6 +70,9 @@ const propTypes = {
     /** Whether to remove the lateral padding and align the content with the margins */
     shouldDisableRowInnerPadding: PropTypes.bool,
 
+    /** Whether to wrap large text up to 2 lines */
+    isMultilineSupported: PropTypes.bool,
+
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     ...withLocalizePropTypes,
@@ -65,12 +81,17 @@ const propTypes = {
 const defaultProps = {
     hoverStyle: styles.sidebarLinkHover,
     showSelectedState: false,
+    shouldShowSelectedStateAsButton: false,
+    selectedStateButtonText: 'Select',
+    onSelectedStatePressed: () => {},
+    highlightSelected: false,
     isSelected: false,
     boldStyle: false,
     showTitleTooltip: false,
     onSelectRow: undefined,
     isDisabled: false,
     optionIsFocused: false,
+    isMultilineSupported: false,
     style: null,
     shouldHaveOptionSeparator: false,
     shouldDisableRowInnerPadding: false,
@@ -89,9 +110,12 @@ class OptionRow extends Component {
         return (
             this.state.isDisabled !== nextState.isDisabled ||
             this.props.isDisabled !== nextProps.isDisabled ||
+            this.props.isMultilineSupported !== nextProps.isMultilineSupported ||
             this.props.isSelected !== nextProps.isSelected ||
             this.props.shouldHaveOptionSeparator !== nextProps.shouldHaveOptionSeparator ||
+            this.props.selectedStateButtonText !== nextProps.selectedStateButtonText ||
             this.props.showSelectedState !== nextProps.showSelectedState ||
+            this.props.highlightSelected !== nextProps.highlightSelected ||
             this.props.showTitleTooltip !== nextProps.showTitleTooltip ||
             !_.isEqual(this.props.option.icons, nextProps.option.icons) ||
             this.props.optionIsFocused !== nextProps.optionIsFocused ||
@@ -119,7 +143,7 @@ class OptionRow extends Component {
         let pressableRef = null;
         const textStyle = this.props.optionIsFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;
         const textUnreadStyle = this.props.boldStyle || this.props.option.boldStyle ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
-        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre);
+        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre, this.state.isDisabled ? styles.optionRowDisabled : {});
         const alternateTextStyle = StyleUtils.combineStyles(
             textStyle,
             styles.optionAlternateText,
@@ -182,6 +206,7 @@ class OptionRow extends Component {
                                 this.props.optionIsFocused ? styles.sidebarLinkActive : null,
                                 this.props.shouldHaveOptionSeparator && styles.borderTop,
                                 !this.props.onSelectRow && !this.props.isDisabled ? styles.cursorDefault : null,
+                                this.props.isSelected && this.props.highlightSelected && styles.optionRowSelected,
                             ]}
                             accessibilityLabel={this.props.option.text}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
@@ -216,7 +241,7 @@ class OptionRow extends Component {
                                             fullTitle={this.props.option.text}
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled={this.props.showTitleTooltip}
-                                            numberOfLines={1}
+                                            numberOfLines={this.props.isMultilineSupported ? 2 : 1}
                                             textStyles={displayNameStyle}
                                             shouldUseFullTitle={
                                                 this.props.option.isChatRoom ||
@@ -248,7 +273,34 @@ class OptionRow extends Component {
                                             />
                                         </View>
                                     )}
-                                    {this.props.showSelectedState && <SelectCircle isChecked={this.props.isSelected} />}
+                                    {this.props.showSelectedState && (
+                                        <>
+                                            {this.props.shouldShowSelectedStateAsButton && !this.props.isSelected ? (
+                                                <Button
+                                                    style={[styles.pl2]}
+                                                    text={this.props.selectedStateButtonText}
+                                                    onPress={() => this.props.onSelectedStatePressed(this.props.option)}
+                                                    small
+                                                />
+                                            ) : (
+                                                <PressableWithFeedback
+                                                    onPress={() => this.props.onSelectedStatePressed(this.props.option)}
+                                                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
+                                                    accessibilityLabel={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
+                                                >
+                                                    <SelectCircle isChecked={this.props.isSelected} />
+                                                </PressableWithFeedback>
+                                            )}
+                                        </>
+                                    )}
+                                    {this.props.isSelected && this.props.highlightSelected && (
+                                        <View style={styles.defaultCheckmarkWrapper}>
+                                            <Icon
+                                                src={Expensicons.Checkmark}
+                                                fill={themeColors.iconSuccessFill}
+                                            />
+                                        </View>
+                                    )}
                                 </View>
                             </View>
                             {Boolean(this.props.option.customIcon) && (
diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
index 6e602f89b94d..9b6875ccf8c2 100644
--- a/src/components/OptionsList/BaseOptionsList.js
+++ b/src/components/OptionsList/BaseOptionsList.js
@@ -21,6 +21,9 @@ const propTypes = {
     /** Callback executed on scroll. Only used for web/desktop component */
     onScroll: PropTypes.func,
 
+    /** List styles for SectionList */
+    listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
     ...optionsListPropTypes,
 };
 
@@ -28,6 +31,7 @@ const defaultProps = {
     keyboardDismissMode: 'none',
     onScrollBeginDrag: () => {},
     onScroll: () => {},
+    listStyles: [],
     ...optionsListDefaultProps,
 };
 
@@ -35,6 +39,7 @@ function BaseOptionsList({
     keyboardDismissMode,
     onScrollBeginDrag,
     onScroll,
+    listStyles,
     focusedIndex,
     selectedOptions,
     headerMessage,
@@ -51,10 +56,15 @@ function BaseOptionsList({
     shouldDisableRowInnerPadding,
     disableFocusOptions,
     canSelectMultipleOptions,
+    shouldShowMultipleOptionSelectorAsButton,
+    multipleOptionSelectorButtonText,
+    onAddToSelection,
+    highlightSelectedOptions,
     onSelectRow,
     boldStyle,
     isDisabled,
     innerRef,
+    isRowMultilineSupported,
 }) {
     const flattenedData = useRef();
     const previousSections = usePrevious(sections);
@@ -163,6 +173,18 @@ function BaseOptionsList({
      */
     const renderItem = ({item, index, section}) => {
         const isItemDisabled = isDisabled || section.isDisabled || !!item.isDisabled;
+        const isSelected = _.some(selectedOptions, (option) => {
+            if (option.accountID === item.accountID) {
+                return true;
+            }
+
+            if (_.isEmpty(option.name)) {
+                return false;
+            }
+
+            return option.name === item.searchText;
+        });
+
         return (
             <OptionRow
                 option={item}
@@ -170,12 +192,17 @@ function BaseOptionsList({
                 hoverStyle={optionHoveredStyle}
                 optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + section.indexOffset}
                 onSelectRow={onSelectRow}
-                isSelected={Boolean(_.find(selectedOptions, (option) => option.accountID === item.accountID))}
+                isSelected={isSelected}
                 showSelectedState={canSelectMultipleOptions}
+                shouldShowSelectedStateAsButton={shouldShowMultipleOptionSelectorAsButton}
+                selectedStateButtonText={multipleOptionSelectorButtonText}
+                onSelectedStatePressed={onAddToSelection}
+                highlightSelected={highlightSelectedOptions}
                 boldStyle={boldStyle}
                 isDisabled={isItemDisabled}
                 shouldHaveOptionSeparator={index > 0 && shouldHaveOptionSeparator}
                 shouldDisableRowInnerPadding={shouldDisableRowInnerPadding}
+                isMultilineSupported={isRowMultilineSupported}
             />
         );
     };
@@ -209,7 +236,7 @@ function BaseOptionsList({
     return (
         <View style={listContainerStyles}>
             {isLoading ? (
-                <OptionsListSkeletonView />
+                <OptionsListSkeletonView shouldAnimate />
             ) : (
                 <>
                     {headerMessage ? (
@@ -219,6 +246,8 @@ function BaseOptionsList({
                     ) : null}
                     <SectionList
                         ref={innerRef}
+                        nestedScrollEnabled
+                        style={listStyles}
                         indicatorStyle="white"
                         keyboardShouldPersistTaps="always"
                         keyboardDismissMode={keyboardDismissMode}
diff --git a/src/components/OptionsList/optionsListPropTypes.js b/src/components/OptionsList/optionsListPropTypes.js
index 74c13c7f2455..a2479c878041 100644
--- a/src/components/OptionsList/optionsListPropTypes.js
+++ b/src/components/OptionsList/optionsListPropTypes.js
@@ -40,6 +40,9 @@ const propTypes = {
     /** Whether we can select multiple options or not */
     canSelectMultipleOptions: PropTypes.bool,
 
+    /** Whether we highlight selected options */
+    highlightSelectedOptions: PropTypes.bool,
+
     /** Whether to show headers above each section or not */
     hideSectionHeaders: PropTypes.bool,
 
@@ -78,6 +81,9 @@ const propTypes = {
 
     /** Whether to show the scroll bar */
     showScrollIndicator: PropTypes.bool,
+
+    /** Whether to wrap large text up to 2 lines */
+    isRowMultilineSupported: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -88,6 +94,7 @@ const defaultProps = {
     focusedIndex: 0,
     selectedOptions: [],
     canSelectMultipleOptions: false,
+    highlightSelectedOptions: false,
     hideSectionHeaders: false,
     disableFocusOptions: false,
     boldStyle: false,
@@ -101,6 +108,7 @@ const defaultProps = {
     shouldHaveOptionSeparator: false,
     shouldDisableRowInnerPadding: false,
     showScrollIndicator: false,
+    isRowMultilineSupported: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/OptionsListSkeletonView.js b/src/components/OptionsListSkeletonView.js
index ffe9652e3945..15c66affe84d 100644
--- a/src/components/OptionsListSkeletonView.js
+++ b/src/components/OptionsListSkeletonView.js
@@ -60,8 +60,8 @@ class OptionsListSkeletonView extends React.Component {
                     key={`skeletonViewItems${i}`}
                     animate={this.props.shouldAnimate}
                     height={CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT}
-                    backgroundColor={themeColors.borderLighter}
-                    foregroundColor={themeColors.border}
+                    backgroundColor={themeColors.skeletonLHNIn}
+                    foregroundColor={themeColors.skeletonLHNOut}
                     style={styles.mr5}
                 >
                     <Circle
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index ab17c5de322d..bff9f8b6d7d0 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import {View, InteractionManager} from 'react-native';
+import {View} from 'react-native';
 import Button from '../Button';
 import FixedFooter from '../FixedFooter';
 import OptionsList from '../OptionsList';
@@ -16,11 +16,9 @@ import KeyboardShortcut from '../../libs/KeyboardShortcut';
 import {propTypes as optionsSelectorPropTypes, defaultProps as optionsSelectorDefaultProps} from './optionsSelectorPropTypes';
 import setSelection from '../../libs/setSelection';
 import compose from '../../libs/compose';
+import getPlatform from '../../libs/getPlatform';
 
 const propTypes = {
-    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
-    shouldDelayFocus: PropTypes.bool,
-
     /** padding bottom style of safe area */
     safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
@@ -30,6 +28,9 @@ const propTypes = {
     /** List container styles for OptionsList */
     listContainerStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
+    /** List styles for OptionsList */
+    listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
     ...optionsSelectorPropTypes,
     ...withLocalizePropTypes,
     ...withNavigationFocusPropTypes,
@@ -40,6 +41,7 @@ const defaultProps = {
     safeAreaPaddingBottomStyle: {},
     contentContainerStyles: [],
     listContainerStyles: [styles.flex1],
+    listStyles: [],
     ...optionsSelectorDefaultProps,
 };
 
@@ -66,6 +68,12 @@ class BaseOptionsSelector extends Component {
     componentDidMount() {
         this.subscribeToKeyboardShortcut();
 
+        if (this.props.isFocused && this.props.autoFocus && this.textInput) {
+            setTimeout(() => {
+                this.textInput.focus();
+            }, CONST.ANIMATED_TRANSITION);
+        }
+
         this.scrollToIndex(this.props.selectedOptions.length ? 0 : this.state.focusedIndex, false);
     }
 
@@ -78,12 +86,13 @@ class BaseOptionsSelector extends Component {
             }
         }
 
-        if (this.textInput && this.props.autoFocus && !prevProps.isFocused && this.props.isFocused) {
-            InteractionManager.runAfterInteractions(() => {
-                // If we automatically focus on a text input when mounting a component,
-                // let's automatically focus on it when the component updates as well (eg, when navigating back from a page)
+        // Screen coming back into focus, for example
+        // when doing Cmd+Shift+K, then Cmd+K, then Cmd+Shift+K.
+        // Only applies to platforms that support keyboard shortcuts
+        if ([CONST.PLATFORM.DESKTOP, CONST.PLATFORM.WEB].includes(getPlatform()) && !prevProps.isFocused && this.props.isFocused && this.props.autoFocus && this.textInput) {
+            setTimeout(() => {
                 this.textInput.focus();
-            });
+            }, CONST.ANIMATED_TRANSITION);
         }
 
         if (_.isEqual(this.props.sections, prevProps.sections)) {
@@ -135,6 +144,10 @@ class BaseOptionsSelector extends Component {
      * @returns {Number}
      */
     getInitiallyFocusedIndex(allOptions) {
+        if (_.isNumber(this.props.initialFocusedIndex)) {
+            return this.props.initialFocusedIndex;
+        }
+
         if (this.props.selectedOptions.length > 0) {
             return this.props.selectedOptions.length;
         }
@@ -220,6 +233,14 @@ class BaseOptionsSelector extends Component {
         }
     }
 
+    focus() {
+        if (!this.textInput) {
+            return;
+        }
+
+        this.textInput.focus();
+    }
+
     /**
      * Flattens the sections into a single array of options.
      * Each object in this array is enhanced to have:
@@ -343,8 +364,6 @@ class BaseOptionsSelector extends Component {
                 selectTextOnFocus
                 blurOnSubmit={Boolean(this.state.allOptions.length)}
                 spellCheck={false}
-                autoFocus={this.props.autoFocus}
-                shouldDelayFocus={this.props.shouldDelayFocus}
             />
         );
         const optionsList = (
@@ -356,12 +375,16 @@ class BaseOptionsSelector extends Component {
                 focusedIndex={this.state.focusedIndex}
                 selectedOptions={this.props.selectedOptions}
                 canSelectMultipleOptions={this.props.canSelectMultipleOptions}
+                shouldShowMultipleOptionSelectorAsButton={this.props.shouldShowMultipleOptionSelectorAsButton}
+                multipleOptionSelectorButtonText={this.props.multipleOptionSelectorButtonText}
+                onAddToSelection={this.props.onAddToSelection}
                 hideSectionHeaders={this.props.hideSectionHeaders}
                 headerMessage={this.props.headerMessage}
                 boldStyle={this.props.boldStyle}
                 showTitleTooltip={this.props.showTitleTooltip}
                 isDisabled={this.props.isDisabled}
                 shouldHaveOptionSeparator={this.props.shouldHaveOptionSeparator}
+                highlightSelectedOptions={this.props.highlightSelectedOptions}
                 onLayout={() => {
                     if (this.props.selectedOptions.length === 0) {
                         this.scrollToIndex(this.state.focusedIndex, false);
@@ -373,8 +396,10 @@ class BaseOptionsSelector extends Component {
                 }}
                 contentContainerStyles={[safeAreaPaddingBottomStyle, ...this.props.contentContainerStyles]}
                 listContainerStyles={this.props.listContainerStyles}
+                listStyles={this.props.listStyles}
                 isLoading={!this.props.shouldShowOptions}
                 showScrollIndicator={this.props.showScrollIndicator}
+                isRowMultilineSupported={this.props.isRowMultilineSupported}
             />
         );
         return (
diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js
index 02b807bf66c1..ca336c324673 100644
--- a/src/components/OptionsSelector/optionsSelectorPropTypes.js
+++ b/src/components/OptionsSelector/optionsSelectorPropTypes.js
@@ -53,6 +53,18 @@ const propTypes = {
     /** Whether we can select multiple options */
     canSelectMultipleOptions: PropTypes.bool,
 
+    /** Whether to show a button pill instead of a standard tickbox */
+    shouldShowMultipleOptionSelectorAsButton: PropTypes.bool,
+
+    /** Text for button pill */
+    multipleOptionSelectorButtonText: PropTypes.string,
+
+    /** Callback to fire when the multiple selector (tickbox or button) is clicked */
+    onAddToSelection: PropTypes.func,
+
+    /** Whether we highlight selected options */
+    highlightSelectedOptions: PropTypes.bool,
+
     /** Whether any section headers should be visible */
     hideSectionHeaders: PropTypes.bool,
 
@@ -106,6 +118,12 @@ const propTypes = {
 
     /** Whether to use default padding and flex styles for children */
     shouldUseStyleForChildren: PropTypes.bool,
+
+    /** Whether to wrap large text up to 2 lines */
+    isRowMultilineSupported: PropTypes.bool,
+
+    /** Initial focused index value */
+    initialFocusedIndex: PropTypes.number,
 };
 
 const defaultProps = {
@@ -116,6 +134,10 @@ const defaultProps = {
     selectedOptions: [],
     headerMessage: '',
     canSelectMultipleOptions: false,
+    shouldShowMultipleOptionSelectorAsButton: false,
+    multipleOptionSelectorButtonText: '',
+    onAddToSelection: () => {},
+    highlightSelectedOptions: false,
     hideSectionHeaders: false,
     boldStyle: false,
     showTitleTooltip: false,
@@ -136,6 +158,8 @@ const defaultProps = {
     shouldShowTextInput: true,
     onChangeText: () => {},
     shouldUseStyleForChildren: true,
+    isRowMultilineSupported: false,
+    initialFocusedIndex: undefined,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/PDFView/PDFPasswordForm.js b/src/components/PDFView/PDFPasswordForm.js
index 3a7814684ebb..29e6e2c49ec6 100644
--- a/src/components/PDFView/PDFPasswordForm.js
+++ b/src/components/PDFView/PDFPasswordForm.js
@@ -132,6 +132,8 @@ function PDFPasswordForm({isFocused, isPasswordInvalid, shouldShowLoadingIndicat
                 secureTextEntry
             />
             <Button
+                // Keep focus on the TextInput effectively keeping keyboard open
+                onMouseDown={(e) => e.preventDefault()}
                 text={translate('common.confirm')}
                 onPress={submitPassword}
                 style={styles.mt4}
diff --git a/src/components/PDFView/index.native.js b/src/components/PDFView/index.native.js
index c240ade664e5..0bd9936c628b 100644
--- a/src/components/PDFView/index.native.js
+++ b/src/components/PDFView/index.native.js
@@ -148,6 +148,7 @@ class PDFView extends Component {
                 )}
                 {this.state.shouldAttemptPDFLoad && (
                     <PDF
+                        fitPolicy={0}
                         trustAllCerts={false}
                         renderActivityIndicator={() => <FullScreenLoadingIndicator />}
                         source={{uri: this.props.sourceURL}}
diff --git a/src/components/Picker/BasePicker.js b/src/components/Picker/BasePicker.js
index 550b8a386aa1..697dfc509d22 100644
--- a/src/components/Picker/BasePicker.js
+++ b/src/components/Picker/BasePicker.js
@@ -258,6 +258,7 @@ function BasePicker(props) {
                     }}
                     pickerProps={{
                         ref: picker,
+                        tabIndex: -1,
                         onFocus: enableHighlight,
                         onBlur: () => {
                             disableHighlight();
diff --git a/src/components/PlaidLink/index.native.js b/src/components/PlaidLink/index.native.js
index cd17453820cf..48cd41e283c3 100644
--- a/src/components/PlaidLink/index.native.js
+++ b/src/components/PlaidLink/index.native.js
@@ -1,16 +1,13 @@
 import {useEffect} from 'react';
 import {openLink, useDeepLinkRedirector, usePlaidEmitter} from 'react-native-plaid-link-sdk';
 import Log from '../../libs/Log';
-import CONST from '../../CONST';
 import {plaidLinkPropTypes, plaidLinkDefaultProps} from './plaidLinkPropTypes';
 
 function PlaidLink(props) {
     useDeepLinkRedirector();
     usePlaidEmitter((event) => {
         Log.info('[PlaidLink] Handled Plaid Event: ', false, event);
-        if (event.eventName === CONST.PLAID.EVENT.ERROR) {
-            props.onError(event.metadata);
-        }
+        props.onEvent(event.eventName, event.metadata);
     });
     useEffect(() => {
         openLink({
@@ -20,9 +17,6 @@ function PlaidLink(props) {
             onSuccess: ({publicToken, metadata}) => {
                 props.onSuccess({publicToken, metadata});
             },
-            onEvent: (event, metadata) => {
-                props.onEvent(event, metadata);
-            },
             onExit: (exitError, metadata) => {
                 Log.info('[PlaidLink] Exit: ', false, {exitError, metadata});
                 props.onExit();
diff --git a/src/components/Popover/index.js b/src/components/Popover/index.js
index bfd02ba1d3e3..a886fbbd0c6b 100644
--- a/src/components/Popover/index.js
+++ b/src/components/Popover/index.js
@@ -11,23 +11,41 @@ import PopoverWithoutOverlay from '../PopoverWithoutOverlay';
  * On small screen widths, it uses BottomDocked modal type, and a Popover type on wide screen widths.
  */
 function Popover(props) {
-    if (!props.fullscreen && !props.isSmallScreenWidth) {
+    const {isVisible, onClose, isSmallScreenWidth, fullscreen, animationInTiming, onLayout, animationOutTiming, disableAnimation, withoutOverlay, anchorPosition} = props;
+
+    // Not adding this inside the PopoverProvider
+    // because this is an issue on smaller screens as well.
+    React.useEffect(() => {
+        const listener = () => {
+            if (!isVisible) {
+                return;
+            }
+
+            onClose();
+        };
+        window.addEventListener('popstate', listener);
+        return () => {
+            window.removeEventListener('popstate', listener);
+        };
+    }, [onClose, isVisible]);
+
+    if (!fullscreen && !isSmallScreenWidth) {
         return createPortal(
             <Modal
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 type={CONST.MODAL.MODAL_TYPE.POPOVER}
-                popoverAnchorPosition={props.anchorPosition}
-                animationInTiming={props.disableAnimation ? 1 : props.animationInTiming}
-                animationOutTiming={props.disableAnimation ? 1 : props.animationOutTiming}
+                popoverAnchorPosition={anchorPosition}
+                animationInTiming={disableAnimation ? 1 : animationInTiming}
+                animationOutTiming={disableAnimation ? 1 : animationOutTiming}
                 shouldCloseOnOutsideClick
-                onLayout={props.onLayout}
+                onLayout={onLayout}
             />,
             document.body,
         );
     }
 
-    if (props.withoutOverlay && !props.isSmallScreenWidth) {
+    if (withoutOverlay && !isSmallScreenWidth) {
         // eslint-disable-next-line react/jsx-props-no-spreading
         return createPortal(<PopoverWithoutOverlay {...props} />, document.body);
     }
@@ -36,12 +54,12 @@ function Popover(props) {
         <Modal
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
-            type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
-            popoverAnchorPosition={props.isSmallScreenWidth ? undefined : props.anchorPosition}
-            fullscreen={props.isSmallScreenWidth ? true : props.fullscreen}
-            animationInTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationInTiming}
-            animationOutTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationOutTiming}
-            onLayout={props.onLayout}
+            type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
+            popoverAnchorPosition={isSmallScreenWidth ? undefined : anchorPosition}
+            fullscreen={isSmallScreenWidth ? true : fullscreen}
+            animationInTiming={disableAnimation && !isSmallScreenWidth ? 1 : animationInTiming}
+            animationOutTiming={disableAnimation && !isSmallScreenWidth ? 1 : animationOutTiming}
+            onLayout={onLayout}
         />
     );
 }
diff --git a/src/components/PopoverMenu/index.js b/src/components/PopoverMenu/index.js
index 67b9a0406aef..5fabf73547ea 100644
--- a/src/components/PopoverMenu/index.js
+++ b/src/components/PopoverMenu/index.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React, {useState} from 'react';
+import React, {useRef} from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import PopoverWithMeasuredContent from '../PopoverWithMeasuredContent';
@@ -48,13 +48,13 @@ const defaultProps = {
 
 function PopoverMenu(props) {
     const {isSmallScreenWidth} = useWindowDimensions();
-    const [selectedItemIndex, setSelectedItemIndex] = useState(null);
+    const selectedItemIndex = useRef(null);
     const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: props.menuItems.length - 1, isActive: props.isVisible});
 
     const selectItem = (index) => {
         const selectedItem = props.menuItems[index];
         props.onItemSelected(selectedItem, index);
-        setSelectedItemIndex(index);
+        selectedItemIndex.current = index;
     };
 
     useKeyboardShortcut(
@@ -78,9 +78,9 @@ function PopoverMenu(props) {
             isVisible={props.isVisible}
             onModalHide={() => {
                 setFocusedIndex(-1);
-                if (selectedItemIndex !== null) {
-                    props.menuItems[selectedItemIndex].onSelected();
-                    setSelectedItemIndex(null);
+                if (selectedItemIndex.current !== null) {
+                    props.menuItems[selectedItemIndex.current].onSelected();
+                    selectedItemIndex.current = null;
                 }
             }}
             animationIn={props.animationIn}
diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
index 0c5b75b1bb13..9bb221b2de1e 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
@@ -5,6 +5,7 @@ import _ from 'underscore';
 import Accessibility from '../../../libs/Accessibility';
 import HapticFeedback from '../../../libs/HapticFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
+import * as Browser from '../../../libs/Browser';
 import styles from '../../../styles/styles';
 import genericPressablePropTypes from './PropTypes';
 import CONST from '../../../CONST';
@@ -127,13 +128,15 @@ const GenericPressable = forwardRef((props, ref) => {
         return KeyboardShortcut.subscribe(shortcutKey, onPressHandler, descriptionKey, modifiers, true, false, 0, false);
     }, [keyboardShortcut, onPressHandler]);
 
+    const defaultLongPressHandler = Browser.isMobileChrome() ? () => {} : undefined;
     return (
         <Pressable
             hitSlop={shouldUseAutoHitSlop ? hitSlop : undefined}
             onLayout={shouldUseAutoHitSlop ? onLayout : undefined}
             ref={ref}
             onPress={!isDisabled ? onPressHandler : undefined}
-            onLongPress={!isDisabled && onLongPress ? onLongPressHandler : undefined}
+            // In order to prevent haptic feedback, pass empty callback as onLongPress props. Please refer https://github.com/necolas/react-native-web/issues/2349#issuecomment-1195564240
+            onLongPress={!isDisabled && onLongPress ? onLongPressHandler : defaultLongPressHandler}
             onKeyPress={!isDisabled ? onKeyPressHandler : undefined}
             onKeyDown={!isDisabled ? onKeyDown : undefined}
             onPressIn={!isDisabled ? onPressIn : undefined}
diff --git a/src/components/Pressable/GenericPressable/index.js b/src/components/Pressable/GenericPressable/index.js
index 65fca85bc324..774ac3ac5092 100644
--- a/src/components/Pressable/GenericPressable/index.js
+++ b/src/components/Pressable/GenericPressable/index.js
@@ -15,7 +15,7 @@ const WebGenericPressable = forwardRef((props, ref) => (
         aria-labelledby={props.accessibilityLabelledBy}
         aria-valuenow={props.accessibilityValue}
         nativeID={props.nativeID}
-        dataSet={{tag: 'pressable', ...(props.noDragArea && {dragArea: false})}}
+        dataSet={{tag: 'pressable', ...(props.noDragArea && {dragArea: false}), ...props.dataSet}}
     />
 ));
 
diff --git a/src/components/PressableWithSecondaryInteraction/index.js b/src/components/PressableWithSecondaryInteraction/index.js
index 2771db6206ae..d84a3f282e97 100644
--- a/src/components/PressableWithSecondaryInteraction/index.js
+++ b/src/components/PressableWithSecondaryInteraction/index.js
@@ -1,103 +1,123 @@
 import _ from 'underscore';
-import React, {Component} from 'react';
-import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
+import React, {forwardRef, useEffect, useRef} from 'react';
 import styles from '../../styles/styles';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import * as StyleUtils from '../../styles/StyleUtils';
 import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
 
 /**
  * This is a special Pressable that calls onSecondaryInteraction when LongPressed, or right-clicked.
  */
-class PressableWithSecondaryInteraction extends Component {
-    constructor(props) {
-        super(props);
-        this.executeSecondaryInteraction = this.executeSecondaryInteraction.bind(this);
-        this.executeSecondaryInteractionOnContextMenu = this.executeSecondaryInteractionOnContextMenu.bind(this);
-    }
-
-    componentDidMount() {
-        if (this.props.forwardedRef) {
-            if (_.isFunction(this.props.forwardedRef)) {
-                this.props.forwardedRef(this.pressableRef);
-            } else if (_.isObject(this.props.forwardedRef)) {
-                this.props.forwardedRef.current = this.pressableRef;
-            }
-        }
-        this.pressableRef.addEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
-    }
 
-    componentWillUnmount() {
-        this.pressableRef.removeEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
-    }
+function PressableWithSecondaryInteraction({
+    children,
+    inline,
+    style,
+    enableLongPressWithHover,
+    withoutFocusOnSecondaryInteraction,
+    preventDefaultContextMenu,
+    onSecondaryInteraction,
+    onPressIn,
+    onPress,
+    onPressOut,
+    activeOpacity,
+    forwardedRef,
+    ...rest
+}) {
+    const pressableRef = useRef(null);
 
     /**
      * @param {Event} e - the secondary interaction event
      */
-    executeSecondaryInteraction(e) {
-        if (DeviceCapabilities.hasHoverSupport() && !this.props.enableLongPressWithHover) {
+    const executeSecondaryInteraction = (e) => {
+        if (DeviceCapabilities.hasHoverSupport() && !enableLongPressWithHover) {
             return;
         }
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
+        if (withoutFocusOnSecondaryInteraction && pressableRef.current) {
+            pressableRef.current.blur();
         }
-        this.props.onSecondaryInteraction(e);
-    }
+        onSecondaryInteraction(e);
+    };
 
-    /**
-     * @param {contextmenu} e - A right-click MouseEvent.
-     * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
-     */
-    executeSecondaryInteractionOnContextMenu(e) {
-        if (!this.props.onSecondaryInteraction) {
+    useEffect(() => {
+        if (!pressableRef.current) {
             return;
         }
 
-        e.stopPropagation();
-        if (this.props.preventDefaultContextMenu) {
-            e.preventDefault();
+        if (forwardedRef) {
+            if (_.isFunction(forwardedRef)) {
+                forwardedRef(pressableRef.current);
+            } else if (_.isObject(forwardedRef)) {
+                // eslint-disable-next-line no-param-reassign
+                forwardedRef.current = pressableRef.current;
+            }
         }
 
-        this.props.onSecondaryInteraction(e);
+        const element = pressableRef.current;
+
         /**
-         * This component prevents the tapped element from capturing focus.
-         * We need to blur this element when clicked as it opens modal that implements focus-trapping.
-         * When the modal is closed it focuses back to the last active element.
-         * Therefore it shifts the element to bring it back to focus.
-         * https://github.com/Expensify/App/issues/14148
+         * @param {contextmenu} e - A right-click MouseEvent.
+         * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
          */
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
-        }
-    }
-
-    render() {
-        const defaultPressableProps = _.omit(this.props, ['onSecondaryInteraction', 'children', 'onLongPress']);
-        const inlineStyle = this.props.inline ? styles.dInline : {};
-
-        // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
-        return (
-            <PressableWithFeedback
-                wrapperStyle={StyleUtils.combineStyles(DeviceCapabilities.canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle)}
-                onPressIn={this.props.onPressIn}
-                onLongPress={this.props.onSecondaryInteraction ? this.executeSecondaryInteraction : undefined}
-                pressDimmingValue={this.props.activeOpacity}
-                onPressOut={this.props.onPressOut}
-                onPress={this.props.onPress}
-                ref={(el) => (this.pressableRef = el)}
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...defaultPressableProps}
-                style={(state) => [StyleUtils.parseStyleFromFunction(this.props.style, state), inlineStyle]}
-            >
-                {this.props.children}
-            </PressableWithFeedback>
-        );
-    }
+        const executeSecondaryInteractionOnContextMenu = (e) => {
+            if (!onSecondaryInteraction) {
+                return;
+            }
+
+            e.stopPropagation();
+            if (preventDefaultContextMenu) {
+                e.preventDefault();
+            }
+
+            onSecondaryInteraction(e);
+
+            /**
+             * This component prevents the tapped element from capturing focus.
+             * We need to blur this element when clicked as it opens modal that implements focus-trapping.
+             * When the modal is closed it focuses back to the last active element.
+             * Therefore it shifts the element to bring it back to focus.
+             * https://github.com/Expensify/App/issues/14148
+             */
+            if (withoutFocusOnSecondaryInteraction) {
+                element.blur();
+            }
+        };
+
+        element.addEventListener('contextmenu', executeSecondaryInteractionOnContextMenu);
+
+        return () => {
+            element.removeEventListener('contextmenu', executeSecondaryInteractionOnContextMenu);
+        };
+    }, [forwardedRef, onSecondaryInteraction, preventDefaultContextMenu, withoutFocusOnSecondaryInteraction]);
+
+    const defaultPressableProps = _.omit(rest, ['onLongPress']);
+    const inlineStyle = inline ? styles.dInline : {};
+
+    // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
+    return (
+        <PressableWithFeedback
+            wrapperStyle={StyleUtils.combineStyles(DeviceCapabilities.canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle)}
+            onPressIn={onPressIn}
+            onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
+            pressDimmingValue={activeOpacity}
+            onPressOut={onPressOut}
+            onPress={onPress}
+            ref={pressableRef}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...defaultPressableProps}
+            style={(state) => [StyleUtils.parseStyleFromFunction(style, state), inlineStyle]}
+        >
+            {children}
+        </PressableWithFeedback>
+    );
 }
 
 PressableWithSecondaryInteraction.propTypes = pressableWithSecondaryInteractionPropTypes.propTypes;
 PressableWithSecondaryInteraction.defaultProps = pressableWithSecondaryInteractionPropTypes.defaultProps;
-export default React.forwardRef((props, ref) => (
+PressableWithSecondaryInteraction.displayName = 'PressableWithSecondaryInteraction';
+
+export default forwardRef((props, ref) => (
     <PressableWithSecondaryInteraction
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
diff --git a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
index de0adbe81297..f521a57957f3 100644
--- a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
+++ b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
@@ -12,7 +12,12 @@ const propTypes = {
     /** The function that should be called when this pressable is pressedOut */
     onPressOut: PropTypes.func,
 
-    /** The function that should be called when this pressable is LongPressed or right-clicked. */
+    /**
+     * The function that should be called when this pressable is LongPressed or right-clicked.
+     *
+     * This function should be stable, preferably wrapped in a `useCallback` so that it does not
+     * cause several re-renders.
+     */
     onSecondaryInteraction: PropTypes.func,
 
     /** The children which should be contained in this wrapper component. */
diff --git a/src/components/QRShare/index.js b/src/components/QRShare/index.js
index 05ae4165ea8e..d96024ad1046 100644
--- a/src/components/QRShare/index.js
+++ b/src/components/QRShare/index.js
@@ -50,7 +50,7 @@ class QRShare extends Component {
             >
                 <View style={styles.expensifyQrLogo}>
                     <ExpensifyWordmark
-                        fill={defaultTheme.borderFocus}
+                        fill={defaultTheme.QRLogo}
                         width="100%"
                         height="100%"
                     />
diff --git a/src/components/Reactions/AddReactionBubble.js b/src/components/Reactions/AddReactionBubble.js
index 922be96084d8..0315c63aabf1 100644
--- a/src/components/Reactions/AddReactionBubble.js
+++ b/src/components/Reactions/AddReactionBubble.js
@@ -94,6 +94,7 @@ function AddReactionBubble(props) {
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 // disable dimming
                 pressDimmingValue={1}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {({hovered, pressed}) => (
                     <>
diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js
index bb37735d6920..818bc8f33309 100644
--- a/src/components/Reactions/EmojiReactionBubble.js
+++ b/src/components/Reactions/EmojiReactionBubble.js
@@ -60,6 +60,7 @@ function EmojiReactionBubble(props) {
                 styles.emojiReactionBubble,
                 StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, props.hasUserReacted, props.isContextMenu),
                 props.shouldBlockReactions && styles.cursorDisabled,
+                styles.userSelectNone,
             ]}
             onPress={() => {
                 if (props.shouldBlockReactions) {
@@ -83,9 +84,10 @@ function EmojiReactionBubble(props) {
             }}
             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
             accessibilityLabel={props.emojiCodes.join('')}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
-            <Text style={[styles.emojiReactionBubbleText, styles.userSelectNone, StyleUtils.getEmojiReactionBubbleTextStyle(props.isContextMenu)]}>{props.emojiCodes.join('')}</Text>
-            {props.count > 0 && <Text style={[styles.reactionCounterText, styles.userSelectNone, StyleUtils.getEmojiReactionCounterTextStyle(props.hasUserReacted)]}>{props.count}</Text>}
+            <Text style={[styles.emojiReactionBubbleText, StyleUtils.getEmojiReactionBubbleTextStyle(props.isContextMenu)]}>{props.emojiCodes.join('')}</Text>
+            {props.count > 0 && <Text style={[styles.reactionCounterText, StyleUtils.getEmojiReactionCounterTextStyle(props.hasUserReacted)]}>{props.count}</Text>}
         </PressableWithSecondaryInteraction>
     );
 }
diff --git a/src/components/Reactions/MiniQuickEmojiReactions.js b/src/components/Reactions/MiniQuickEmojiReactions.js
index 82f83cb1e961..a22a2967cefe 100644
--- a/src/components/Reactions/MiniQuickEmojiReactions.js
+++ b/src/components/Reactions/MiniQuickEmojiReactions.js
@@ -80,7 +80,12 @@ function MiniQuickEmojiReactions(props) {
                     tooltipText={`:${EmojiUtils.getLocalizedEmojiName(emoji.name, props.preferredLocale)}:`}
                     onPress={Session.checkIfActionIsAllowed(() => props.onEmojiSelected(emoji, props.emojiReactions))}
                 >
-                    <Text style={[styles.miniQuickEmojiReactionText, styles.userSelectNone]}>{EmojiUtils.getPreferredEmojiCode(emoji, props.preferredSkinTone)}</Text>
+                    <Text
+                        style={[styles.miniQuickEmojiReactionText, styles.userSelectNone]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                    >
+                        {EmojiUtils.getPreferredEmojiCode(emoji, props.preferredSkinTone)}
+                    </Text>
                 </BaseMiniContextMenuItem>
             ))}
             <BaseMiniContextMenuItem
diff --git a/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js b/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
index 69ff37338c2d..b5046fbd59ce 100644
--- a/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
+++ b/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
@@ -80,7 +80,7 @@ function BaseQuickEmojiReactions(props) {
                 isContextMenu
                 onPressOpenPicker={props.onPressOpenPicker}
                 onWillShowPicker={props.onWillShowPicker}
-                onSelectEmoji={props.onEmojiSelected}
+                onSelectEmoji={(emoji) => props.onEmojiSelected(emoji, props.emojiReactions)}
                 reportAction={props.reportAction}
             />
         </View>
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index ec2755f1a5dd..c1e1764ed9f1 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -42,7 +42,7 @@ const defaultProps = {
 
 function ReportActionItemEmojiReactions(props) {
     const {reactionListRef} = useContext(ReportScreenContext);
-    const popoverReactionListAnchor = useRef(null);
+    const popoverReactionListAnchors = useRef({});
     let totalReactionCount = 0;
 
     // Each emoji is sorted by the oldest timestamp of user reactions so that they will always appear in the same order for everyone
@@ -95,7 +95,7 @@ function ReportActionItemEmojiReactions(props) {
         };
 
         const onReactionListOpen = (event) => {
-            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportActionID);
+            reactionListRef.current.showReactionList(event, popoverReactionListAnchors.current[reactionEmojiName], reactionEmojiName, props.reportActionID);
         };
 
         return {
@@ -112,10 +112,7 @@ function ReportActionItemEmojiReactions(props) {
 
     return (
         totalReactionCount > 0 && (
-            <View
-                ref={popoverReactionListAnchor}
-                style={[styles.flexRow, styles.flexWrap, styles.gap1, styles.mt2]}
-            >
+            <View style={[styles.flexRow, styles.flexWrap, styles.gap1, styles.mt2]}>
                 {_.map(formattedReactions, (reaction) => {
                     if (reaction === null) {
                         return;
@@ -135,7 +132,7 @@ function ReportActionItemEmojiReactions(props) {
                         >
                             <View>
                                 <EmojiReactionBubble
-                                    ref={props.forwardedRef}
+                                    ref={(ref) => (popoverReactionListAnchors.current[reaction.reactionEmojiName] = ref)}
                                     count={reaction.reactionCount}
                                     emojiCodes={reaction.emojiCodes}
                                     onPress={reaction.onPress}
diff --git a/src/components/ReportActionItem/MoneyReportView.js b/src/components/ReportActionItem/MoneyReportView.js
index f863c8994c6f..68eecf11d5bf 100644
--- a/src/components/ReportActionItem/MoneyReportView.js
+++ b/src/components/ReportActionItem/MoneyReportView.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import reportPropTypes from '../../pages/reportPropTypes';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
 import styles from '../../styles/styles';
+import themeColors from '../../styles/themes/default';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as StyleUtils from '../../styles/StyleUtils';
 import CONST from '../../CONST';
@@ -50,10 +51,10 @@ function MoneyReportView(props) {
                 </View>
                 <View style={[styles.flexRow, styles.justifyContentCenter]}>
                     {isSettled && (
-                        <View style={[styles.defaultCheckmarkWrapper, styles.mh1]}>
+                        <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
                             <Icon
                                 src={Expensicons.Checkmark}
-                                fill={styles.success}
+                                fill={themeColors.success}
                             />
                         </View>
                     )}
diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
index bb312f85be41..3b310bb6b4fa 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.js
+++ b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -58,6 +58,9 @@ const propTypes = {
 
     network: networkPropTypes.isRequired,
 
+    /** Whether a message is a whisper */
+    isWhisper: PropTypes.bool,
+
     /** Styles to be assigned to Container */
     // eslint-disable-next-line react/forbid-prop-types
     style: PropTypes.arrayOf(PropTypes.object),
@@ -71,6 +74,7 @@ const defaultProps = {
     reportActions: {},
     isHovered: false,
     style: [],
+    isWhisper: false,
 };
 
 function MoneyRequestAction({
@@ -86,6 +90,7 @@ function MoneyRequestAction({
     isHovered,
     network,
     style,
+    isWhisper,
 }) {
     const {translate} = useLocalize();
     const isSplitBillAction = lodashGet(action, 'originalMessage.type', '') === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
@@ -137,6 +142,7 @@ function MoneyRequestAction({
             onPreviewPressed={onMoneyRequestPreviewPressed}
             containerStyles={[styles.cursorPointer, isHovered ? styles.reportPreviewBoxHoverBorder : undefined, ...style]}
             isHovered={isHovered}
+            isWhisper={isWhisper}
         />
     );
 }
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 1fb611691fbb..a93e6a0387a1 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -27,13 +27,15 @@ import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import * as IOUUtils from '../../libs/IOUUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as TransactionUtils from '../../libs/TransactionUtils';
-import * as StyleUtils from '../../styles/StyleUtils';
-import getButtonState from '../../libs/getButtonState';
 import refPropTypes from '../refPropTypes';
 import PressableWithFeedback from '../Pressable/PressableWithoutFeedback';
 import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import ReportActionItemImages from './ReportActionItemImages';
 import transactionPropTypes from '../transactionPropTypes';
+import * as StyleUtils from '../../styles/StyleUtils';
+import variables from '../../styles/variables';
+import useWindowDimensions from '../../hooks/useWindowDimensions';
+import MoneyRequestSkeletonView from '../MoneyRequestSkeletonView';
 
 const propTypes = {
     /** The active IOUReport, used for Onyx subscription */
@@ -110,6 +112,9 @@ const propTypes = {
      */
     shouldShowPendingConversionMessage: PropTypes.bool,
 
+    /** Whether a message is a whisper */
+    isWhisper: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
@@ -128,12 +133,16 @@ const defaultProps = {
     },
     transaction: {},
     shouldShowPendingConversionMessage: false,
+    isWhisper: false,
 };
 
 function MoneyRequestPreview(props) {
+    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
+
     if (_.isEmpty(props.iouReport) && !props.isBillSplit) {
         return null;
     }
+
     const sessionAccountID = lodashGet(props.session, 'accountID', null);
     const managerID = props.iouReport.managerID || '';
     const ownerAccountID = props.iouReport.ownerAccountID || '';
@@ -149,26 +158,26 @@ function MoneyRequestPreview(props) {
     const isCurrentUserManager = managerID === sessionAccountID;
 
     const {amount: requestAmount, currency: requestCurrency, comment: requestComment, merchant: requestMerchant} = ReportUtils.getTransactionDetails(props.transaction);
-    let description = requestComment;
+    const description = requestComment;
     const hasReceipt = TransactionUtils.hasReceipt(props.transaction);
     const isScanning = hasReceipt && TransactionUtils.isReceiptBeingScanned(props.transaction);
+    const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(props.transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(props.transaction);
+    const isSettled = ReportUtils.isSettled(props.iouReport);
 
-    // On a distance request the merchant of the transaction will be used for the description since that's where it's stored in the database
-    if (isDistanceRequest) {
-        description = props.transaction.merchant;
-    }
+    // Show the merchant for IOUs and expenses only if they are custom or not related to scanning smartscan
+    const shouldShowMerchant =
+        !_.isEmpty(requestMerchant) && !props.isBillSplit && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
+    const shouldShowDescription = !_.isEmpty(description) && !shouldShowMerchant;
+
+    const receiptImages = hasReceipt ? [ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename || props.transaction.receiptFilename || '')] : [];
 
     const getSettledMessage = () => {
         switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
-            case CONST.IOU.PAYMENT_TYPE.PAYPAL_ME:
-                return props.translate('iou.settledPaypalMe');
-            case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
-                return props.translate('iou.settledElsewhere');
             case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
                 return props.translate('iou.settledExpensify');
             default:
-                return '';
+                return props.translate('iou.settledElsewhere');
         }
     };
 
@@ -223,82 +232,96 @@ function MoneyRequestPreview(props) {
                 errorRowStyles={[styles.mbn1]}
                 needsOffscreenAlphaCompositing
             >
-                <View style={[styles.moneyRequestPreviewBox, isScanning ? styles.reportPreviewBoxHoverBorder : undefined, ...props.containerStyles]}>
+                <View style={[styles.moneyRequestPreviewBox, isScanning || props.isWhisper ? styles.reportPreviewBoxHoverBorder : undefined, ...props.containerStyles]}>
                     {hasReceipt && (
                         <ReportActionItemImages
-                            images={[ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename)]}
+                            images={receiptImages}
                             isHovered={isScanning}
                         />
                     )}
-                    <View style={styles.moneyRequestPreviewBoxText}>
-                        <View style={[styles.flexRow]}>
-                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>{getPreviewHeaderText()}</Text>
-                                {Boolean(getSettledMessage()) && (
-                                    <>
-                                        <Icon
-                                            src={Expensicons.DotIndicator}
-                                            width={4}
-                                            height={4}
-                                            additionalStyles={[styles.mr1, styles.ml1]}
-                                        />
-                                        <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>{getSettledMessage()}</Text>
-                                    </>
+                    {_.isEmpty(props.transaction) ? (
+                        <MoneyRequestSkeletonView />
+                    ) : (
+                        <View style={styles.moneyRequestPreviewBoxText}>
+                            <View style={[styles.flexRow]}>
+                                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                    <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getPreviewHeaderText()}</Text>
+                                    {isSettled && (
+                                        <>
+                                            <Icon
+                                                src={Expensicons.DotIndicator}
+                                                width={4}
+                                                height={4}
+                                                additionalStyles={[styles.mr1, styles.ml1]}
+                                            />
+                                            <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getSettledMessage()}</Text>
+                                        </>
+                                    )}
+                                </View>
+                                {hasFieldErrors && (
+                                    <Icon
+                                        src={Expensicons.DotIndicator}
+                                        fill={themeColors.danger}
+                                    />
                                 )}
                             </View>
-                            <Icon
-                                fill={StyleUtils.getIconFillColor(getButtonState(props.isHovered))}
-                                src={Expensicons.ArrowRight}
-                            />
-                        </View>
-                        <View style={[styles.flexRow]}>
-                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                                <Text style={styles.textHeadline}>{getDisplayAmountText()}</Text>
-                                {ReportUtils.isSettled(props.iouReport.reportID) && !props.isBillSplit && (
-                                    <View style={styles.defaultCheckmarkWrapper}>
-                                        <Icon
-                                            src={Expensicons.Checkmark}
-                                            fill={themeColors.iconSuccessFill}
+                            <View style={[styles.flexRow]}>
+                                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                    <Text
+                                        style={[
+                                            styles.moneyRequestPreviewAmount,
+                                            StyleUtils.getAmountFontSizeAndLineHeight(variables.fontSizeXLarge, variables.lineHeightXXLarge, isSmallScreenWidth, windowWidth),
+                                        ]}
+                                        numberOfLines={1}
+                                    >
+                                        {getDisplayAmountText()}
+                                    </Text>
+                                    {ReportUtils.isSettled(props.iouReport.reportID) && !props.isBillSplit && (
+                                        <View style={styles.defaultCheckmarkWrapper}>
+                                            <Icon
+                                                src={Expensicons.Checkmark}
+                                                fill={themeColors.iconSuccessFill}
+                                            />
+                                        </View>
+                                    )}
+                                </View>
+                                {props.isBillSplit && (
+                                    <View style={styles.moneyRequestPreviewBoxAvatar}>
+                                        <MultipleAvatars
+                                            icons={participantAvatars}
+                                            shouldStackHorizontally
+                                            size="small"
+                                            isHovered={props.isHovered}
+                                            shouldUseCardBackground
                                         />
                                     </View>
                                 )}
                             </View>
-                            {props.isBillSplit && (
-                                <View style={styles.moneyRequestPreviewBoxAvatar}>
-                                    <MultipleAvatars
-                                        icons={participantAvatars}
-                                        shouldStackHorizontally
-                                        size="small"
-                                        isHovered={props.isHovered}
-                                        shouldUseCardBackground
-                                    />
+                            {shouldShowMerchant && (
+                                <View style={[styles.flexRow]}>
+                                    <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20, styles.breakWord]}>{requestMerchant}</Text>
                                 </View>
                             )}
-                        </View>
-                        {!props.isBillSplit && !_.isEmpty(requestMerchant) && (
-                            <View style={[styles.flexRow]}>
-                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16, styles.breakWord]}>{requestMerchant}</Text>
-                            </View>
-                        )}
-                        <View style={[styles.flexRow]}>
-                            <View style={[styles.flex1]}>
-                                {!isCurrentUserManager && props.shouldShowPendingConversionMessage && (
-                                    <Text style={[styles.textLabel, styles.colorMuted, styles.mt1]}>{props.translate('iou.pendingConversionMessage')}</Text>
+                            <View style={[styles.flexRow, styles.mt1]}>
+                                <View style={[styles.flex1]}>
+                                    {!isCurrentUserManager && props.shouldShowPendingConversionMessage && (
+                                        <Text style={[styles.textLabel, styles.colorMuted]}>{props.translate('iou.pendingConversionMessage')}</Text>
+                                    )}
+                                    {shouldShowDescription && <Text style={[styles.colorMuted]}>{description}</Text>}
+                                </View>
+                                {props.isBillSplit && !_.isEmpty(participantAccountIDs) && (
+                                    <Text style={[styles.textLabel, styles.colorMuted, styles.ml1, styles.amountSplitPadding]}>
+                                        {props.translate('iou.amountEach', {
+                                            amount: CurrencyUtils.convertToDisplayString(
+                                                IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency),
+                                                requestCurrency,
+                                            ),
+                                        })}
+                                    </Text>
                                 )}
-                                {!_.isEmpty(description) && <Text style={[styles.mt1, styles.colorMuted]}>{description}</Text>}
                             </View>
-                            {props.isBillSplit && !_.isEmpty(participantAccountIDs) && (
-                                <Text style={[styles.textLabel, styles.colorMuted, styles.ml1]}>
-                                    {props.translate('iou.amountEach', {
-                                        amount: CurrencyUtils.convertToDisplayString(
-                                            IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency),
-                                            requestCurrency,
-                                        ),
-                                    })}
-                                </Text>
-                            )}
                         </View>
-                    </View>
+                    )}
                 </View>
             </OfflineWithFeedback>
         </View>
@@ -316,6 +339,7 @@ function MoneyRequestPreview(props) {
             onLongPress={showContextMenu}
             accessibilityLabel={props.isBillSplit ? props.translate('iou.split') : props.translate('iou.cash')}
             accessibilityHint={CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)}
+            style={styles.moneyRequestPreviewBox}
         >
             {childContainer}
         </PressableWithFeedback>
diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index 86ad56b386a9..712c7ded6ab0 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -66,6 +66,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
         comment: transactionDescription,
         merchant: transactionMerchant,
     } = ReportUtils.getTransactionDetails(transaction);
+    const isEmptyMerchant =
+        transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.UNKNOWN_MERCHANT || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
     const formattedTransactionAmount = transactionAmount && transactionCurrency && CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);
 
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
@@ -86,8 +88,10 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
 
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     let receiptURIs;
+    let hasErrors = false;
     if (hasReceipt) {
         receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction.receipt.source, transaction.filename);
+        hasErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     }
 
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
@@ -101,6 +105,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     style={[StyleUtils.getReportWelcomeBackgroundImageStyle(true)]}
                 />
             </View>
+
             {hasReceipt && (
                 <View style={styles.moneyRequestViewImage}>
                     <ReportActionItemImage
@@ -120,16 +125,22 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     interactive={canEdit}
                     shouldShowRightIcon={canEdit}
                     onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
+                    brickRoadIndicator={hasErrors && transactionAmount === 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                    subtitle={hasErrors && transactionAmount === 0 ? translate('common.error.enterAmount') : ''}
+                    subtitleTextStyle={styles.textLabelError}
                 />
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.comment') || lodashGet(transaction, 'pendingAction')}>
                 <MenuItemWithTopDescription
                     description={translate('common.description')}
+                    shouldParseTitle
                     title={transactionDescription}
                     interactive={canEdit}
                     shouldShowRightIcon={canEdit}
                     titleStyle={styles.flex1}
                     onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
+                    wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
+                    numberOfLinesTitle={0}
                 />
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.created') || lodashGet(transaction, 'pendingAction')}>
@@ -140,6 +151,9 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     shouldShowRightIcon={canEdit}
                     titleStyle={styles.flex1}
                     onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
+                    brickRoadIndicator={hasErrors && transactionDate === '' ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                    subtitle={hasErrors && transactionDate === '' ? translate('common.error.enterDate') : ''}
+                    subtitleTextStyle={styles.textLabelError}
                 />
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
@@ -150,6 +164,9 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     shouldShowRightIcon={canEdit}
                     titleStyle={styles.flex1}
                     onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}
+                    brickRoadIndicator={hasErrors && isEmptyMerchant ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                    subtitle={hasErrors && isEmptyMerchant ? translate('common.error.enterMerchant') : ''}
+                    subtitleTextStyle={styles.textLabelError}
                 />
             </OfflineWithFeedback>
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js
index 089df6cb4a6f..070f534f4924 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.js
+++ b/src/components/ReportActionItem/ReportActionItemImage.js
@@ -15,8 +15,8 @@ const propTypes = {
     /** thumbnail URI for the image */
     thumbnail: PropTypes.string,
 
-    /** URI for the image */
-    image: PropTypes.string.isRequired,
+    /** URI for the image or local numeric reference for the image  */
+    image: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
 
     /** whether or not to enable the image preview modal */
     enablePreviewModal: PropTypes.bool,
@@ -35,47 +35,44 @@ const defaultProps = {
 
 function ReportActionItemImage({thumbnail, image, enablePreviewModal}) {
     const {translate} = useLocalize();
+    const imageSource = tryResolveUrlFromApiRoot(image || '');
+    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail || '');
 
-    if (thumbnail) {
-        const imageSource = tryResolveUrlFromApiRoot(image);
-        const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail);
-        const thumbnailComponent = (
-            <ThumbnailImage
-                previewSourceURL={thumbnailSource}
-                style={[styles.w100, styles.h100]}
-                isAuthTokenRequired
-                shouldDynamicallyResize={false}
-            />
-        );
-
-        if (enablePreviewModal) {
-            return (
-                <ShowContextMenuContext.Consumer>
-                    {({report}) => (
-                        <PressableWithoutFocus
-                            style={[styles.noOutline, styles.w100, styles.h100]}
-                            onPress={() => {
-                                const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource);
-                                Navigation.navigate(route);
-                            }}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                            accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                        >
-                            {thumbnailComponent}
-                        </PressableWithoutFocus>
-                    )}
-                </ShowContextMenuContext.Consumer>
-            );
-        }
-        return thumbnailComponent;
-    }
-
-    return (
+    const receiptImageComponent = thumbnail ? (
+        <ThumbnailImage
+            previewSourceURL={thumbnailSource}
+            style={[styles.w100, styles.h100]}
+            isAuthTokenRequired
+            shouldDynamicallyResize={false}
+        />
+    ) : (
         <Image
             source={{uri: image}}
             style={[styles.w100, styles.h100]}
         />
     );
+
+    if (enablePreviewModal) {
+        return (
+            <ShowContextMenuContext.Consumer>
+                {({report}) => (
+                    <PressableWithoutFocus
+                        style={[styles.noOutline, styles.w100, styles.h100]}
+                        onPress={() => {
+                            const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource);
+                            Navigation.navigate(route);
+                        }}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                    >
+                        {receiptImageComponent}
+                    </PressableWithoutFocus>
+                )}
+            </ShowContextMenuContext.Consumer>
+        );
+    }
+
+    return receiptImageComponent;
 }
 
 ReportActionItemImage.propTypes = propTypes;
diff --git a/src/components/ReportActionItem/ReportActionItemImages.js b/src/components/ReportActionItem/ReportActionItemImages.js
index e9fed1ec289c..7e6287720952 100644
--- a/src/components/ReportActionItem/ReportActionItemImages.js
+++ b/src/components/ReportActionItem/ReportActionItemImages.js
@@ -11,7 +11,7 @@ const propTypes = {
     images: PropTypes.arrayOf(
         PropTypes.shape({
             thumbnail: PropTypes.string,
-            image: PropTypes.string,
+            image: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
         }),
     ).isRequired,
 
@@ -54,10 +54,14 @@ function ReportActionItemImages({images, size, total, isHovered}) {
         <View style={[styles.reportActionItemImages, hoverStyle]}>
             {_.map(shownImages, ({thumbnail, image}, index) => {
                 const isLastImage = index === numberOfShownImages - 1;
+
+                // Show a border to separate multiple images. Shown to the right for each except the last.
+                const shouldShowBorder = shownImages.length > 1 && index < shownImages.length - 1;
+                const borderStyle = shouldShowBorder ? styles.reportActionItemImageBorder : {};
                 return (
                     <View
                         key={`${index}-${image}`}
-                        style={[styles.reportActionItemImage, hoverStyle]}
+                        style={[styles.reportActionItemImage, borderStyle, hoverStyle]}
                     >
                         <ReportActionItemImage
                             thumbnail={thumbnail}
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index 44b0126d891d..5f8151b385a2 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -23,8 +23,6 @@ import ROUTES from '../../ROUTES';
 import SettlementButton from '../SettlementButton';
 import * as IOU from '../../libs/actions/IOU';
 import refPropTypes from '../refPropTypes';
-import * as StyleUtils from '../../styles/StyleUtils';
-import getButtonState from '../../libs/getButtonState';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 import themeColors from '../../styles/themes/default';
 import reportPropTypes from '../../pages/reportPropTypes';
@@ -88,6 +86,9 @@ const propTypes = {
     /** Callback for updating context menu active state, used for showing context menu */
     checkIfContextMenuActive: PropTypes.func,
 
+    /** Whether a message is a whisper */
+    isWhisper: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
@@ -100,14 +101,16 @@ const defaultProps = {
     session: {
         accountID: null,
     },
+    isWhisper: false,
 };
 
 function ReportPreview(props) {
-    const managerID = props.iouReport.managerID || props.action.actorAccountID || 0;
+    const managerID = props.iouReport.managerID || 0;
     const isCurrentUserManager = managerID === lodashGet(props.session, 'accountID');
     const reportTotal = ReportUtils.getMoneyRequestTotal(props.iouReport);
 
     const iouSettled = ReportUtils.isSettled(props.iouReportID);
+    const iouCanceled = ReportUtils.isArchivedRoom(props.chatReport);
     const numberOfRequests = ReportActionUtils.getNumberOfMoneyRequests(props.action);
     const moneyRequestComment = lodashGet(props.action, 'childLastMoneyRequestComment', '');
 
@@ -115,11 +118,15 @@ function ReportPreview(props) {
     const numberOfScanningReceipts = _.filter(transactionsWithReceipts, (transaction) => TransactionUtils.isReceiptBeingScanned(transaction)).length;
     const hasReceipts = transactionsWithReceipts.length > 0;
     const isScanning = hasReceipts && ReportUtils.areAllRequestsBeingSmartScanned(props.iouReportID, props.action);
+    const hasErrors = hasReceipts && ReportUtils.hasMissingSmartscanFields(props.iouReportID);
     const lastThreeTransactionsWithReceipts = ReportUtils.getReportPreviewDisplayTransactions(props.action);
+    const lastThreeReceipts = _.map(lastThreeTransactionsWithReceipts, ({receipt, filename, receiptFilename}) =>
+        ReceiptUtils.getThumbnailAndImageURIs(receipt.source, filename || receiptFilename || ''),
+    );
 
     const hasOnlyOneReceiptRequest = numberOfRequests === 1 && hasReceipts;
     const previewSubtitle = hasOnlyOneReceiptRequest
-        ? transactionsWithReceipts[0].merchant
+        ? TransactionUtils.getMerchant(transactionsWithReceipts[0])
         : props.translate('iou.requestCount', {
               count: numberOfRequests,
               scanningReceipts: numberOfScanningReceipts,
@@ -158,8 +165,8 @@ function ReportPreview(props) {
 
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowSettlementButton = ReportUtils.isControlPolicyExpenseChat(props.chatReport)
-        ? props.policy.role === CONST.POLICY.ROLE.ADMIN && ReportUtils.isReportApproved(props.iouReport) && !iouSettled
-        : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
+        ? props.policy.role === CONST.POLICY.ROLE.ADMIN && ReportUtils.isReportApproved(props.iouReport) && !iouSettled && !iouCanceled
+        : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !iouCanceled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
 
     return (
         <View style={[styles.chatItemMessage, ...props.containerStyles]}>
@@ -170,14 +177,14 @@ function ReportPreview(props) {
                 onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
                 onPressOut={() => ControlSelection.unblock()}
                 onLongPress={(event) => showContextMenuForReport(event, props.contextMenuAnchor, props.chatReportID, props.action, props.checkIfContextMenuActive)}
-                style={[styles.flexRow, styles.justifyContentBetween]}
+                style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox]}
                 accessibilityRole="button"
                 accessibilityLabel={props.translate('iou.viewDetails')}
             >
-                <View style={[styles.reportPreviewBox, props.isHovered || isScanning ? styles.reportPreviewBoxHoverBorder : undefined]}>
+                <View style={[styles.reportPreviewBox, props.isHovered || isScanning || props.isWhisper ? styles.reportPreviewBoxHoverBorder : undefined]}>
                     {hasReceipts && (
                         <ReportActionItemImages
-                            images={_.map(lastThreeTransactionsWithReceipts, ({receipt, filename}) => ReceiptUtils.getThumbnailAndImageURIs(receipt.source, filename))}
+                            images={lastThreeReceipts}
                             size={3}
                             total={transactionsWithReceipts.length}
                             isHovered={props.isHovered || isScanning}
@@ -186,12 +193,14 @@ function ReportPreview(props) {
                     <View style={styles.reportPreviewBoxBody}>
                         <View style={styles.flexRow}>
                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>{getPreviewMessage()}</Text>
+                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getPreviewMessage()}</Text>
                             </View>
-                            <Icon
-                                fill={StyleUtils.getIconFillColor(getButtonState(props.isHovered))}
-                                src={Expensicons.ArrowRight}
-                            />
+                            {hasErrors && (
+                                <Icon
+                                    src={Expensicons.DotIndicator}
+                                    fill={themeColors.danger}
+                                />
+                            )}
                         </View>
                         <View style={styles.flexRow}>
                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
@@ -206,10 +215,10 @@ function ReportPreview(props) {
                                 )}
                             </View>
                         </View>
-                        {hasReceipts && !isScanning && (
+                        {!isScanning && (numberOfRequests > 1 || hasReceipts) && (
                             <View style={styles.flexRow}>
                                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                                    <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>{previewSubtitle || moneyRequestComment}</Text>
+                                    <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{previewSubtitle || moneyRequestComment}</Text>
                                 </View>
                             </View>
                         )}
diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js
index c0b60ad996db..9d32fa7a1e77 100644
--- a/src/components/ReportActionItem/TaskAction.js
+++ b/src/components/ReportActionItem/TaskAction.js
@@ -1,13 +1,10 @@
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
-import compose from '../../libs/compose';
-import ONYXKEYS from '../../ONYXKEYS';
 import Text from '../Text';
 import styles from '../../styles/styles';
-import CONST from '../../CONST';
+import * as Task from '../../libs/actions/Task';
 
 const propTypes = {
     /** Name of the reportAction action */
@@ -17,60 +14,20 @@ const propTypes = {
     // eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC
     taskReportID: PropTypes.string.isRequired,
 
-    /* Onyx Props */
-    taskReport: PropTypes.shape({
-        /** Title of the task */
-        reportName: PropTypes.string,
-
-        /** AccountID of the manager in this iou report */
-        managerID: PropTypes.number,
-
-        /** AccountID of the creator of this iou report */
-        ownerAccountID: PropTypes.number,
-    }),
-
     ...withLocalizePropTypes,
 };
 
-const defaultProps = {
-    taskReport: {},
-};
 function TaskAction(props) {
-    const taskReportName = props.taskReport.reportName || '';
-
-    let taskStatusText = '';
-    switch (props.actionName) {
-        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
-            taskStatusText = props.translate('task.messages.completed');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
-            taskStatusText = props.translate('task.messages.canceled');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
-            taskStatusText = props.translate('task.messages.reopened');
-            break;
-        default:
-            taskStatusText = props.translate('task.task');
-    }
-
     return (
         <>
             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{`${taskStatusText} ${taskReportName}`}</Text>
+                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(props.actionName, props.taskReportID, false)}</Text>
             </View>
         </>
     );
 }
 
 TaskAction.propTypes = propTypes;
-TaskAction.defaultProps = defaultProps;
 TaskAction.displayName = 'TaskAction';
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        taskReport: {
-            key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
-        },
-    }),
-)(TaskAction);
+export default withLocalize(TaskAction);
diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index ca4103624440..d0181e3d736a 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -72,6 +72,11 @@ function TaskPreview(props) {
     const assigneeDisplayName = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'displayName'], '');
     const taskAssignee = assigneeLogin || assigneeDisplayName;
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
+    const isDeletedParentAction = ReportUtils.isCanceledTaskReport(props.taskReport, props.action);
+
+    if (isDeletedParentAction) {
+        return <RenderHTML html={`<comment>${props.translate('parentReportAction.deletedTask')}</comment>`} />;
+    }
 
     return (
         <View style={[styles.chatItemMessage]}>
diff --git a/src/components/ReportActionItem/TaskView.js b/src/components/ReportActionItem/TaskView.js
index 965c3120d51b..8c6432a79878 100644
--- a/src/components/ReportActionItem/TaskView.js
+++ b/src/components/ReportActionItem/TaskView.js
@@ -119,6 +119,7 @@ function TaskView(props) {
                 </Hoverable>
                 <OfflineWithFeedback pendingAction={lodashGet(props, 'report.pendingFields.description')}>
                     <MenuItemWithTopDescription
+                        shouldParseTitle
                         description={props.translate('task.description')}
                         title={props.report.description || ''}
                         onPress={() => Navigation.navigate(ROUTES.getTaskReportDescriptionRoute(props.report.reportID))}
diff --git a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
index f87ae176e3ac..ddaa46e0b731 100644
--- a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
+++ b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
@@ -21,8 +21,8 @@ function SkeletonViewLines(props) {
         <SkeletonViewContentLoader
             animate={props.shouldAnimate}
             height={CONST.CHAT_SKELETON_VIEW.HEIGHT_FOR_ROW_COUNT[props.numberOfRows]}
-            backgroundColor={themeColors.highlightBG}
-            foregroundColor={themeColors.border}
+            backgroundColor={themeColors.skeletonLHNIn}
+            foregroundColor={themeColors.skeletonLHNOut}
             style={styles.mr5}
         >
             <Circle
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 14b369d86a4c..4546e83ef769 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -6,7 +6,7 @@ import useLocalize from '../../hooks/useLocalize';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 import * as RoomNameInputUtils from '../../libs/RoomNameInputUtils';
 
-function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     const [selection, setSelection] = useState();
@@ -57,8 +57,9 @@ function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onB
             onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
             errorText={errorText}
             autoCapitalize="none"
-            onBlur={onBlur}
-            autoFocus={autoFocus}
+            onBlur={() => isFocused && onBlur()}
+            shouldDelayFocus={shouldDelayFocus}
+            autoFocus={isFocused && autoFocus}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
             spellCheck={false}
         />
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
index e263321dea0e..78500a8f0be2 100644
--- a/src/components/RoomNameInput/index.native.js
+++ b/src/components/RoomNameInput/index.native.js
@@ -7,7 +7,7 @@ import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 import * as RoomNameInputUtils from '../../libs/RoomNameInputUtils';
 import getOperatingSystem from '../../libs/getOperatingSystem';
 
-function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     /**
@@ -41,8 +41,8 @@ function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onB
             errorText={errorText}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
             keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
-            onBlur={onBlur}
-            autoFocus={autoFocus}
+            onBlur={() => isFocused && onBlur()}
+            autoFocus={isFocused && autoFocus}
             autoCapitalize="none"
             shouldDelayFocus={shouldDelayFocus}
         />
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 3eef833a1252..ab1ac37d32c8 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import {withNavigationFocusPropTypes} from '../withNavigationFocus';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
@@ -27,6 +28,8 @@ const propTypes = {
 
     /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
     shouldDelayFocus: PropTypes.bool,
+
+    ...withNavigationFocusPropTypes,
 };
 
 const defaultProps = {
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
index ebdd79f586e1..f760e5d5aeb4 100644
--- a/src/components/ScreenWrapper/index.js
+++ b/src/components/ScreenWrapper/index.js
@@ -124,7 +124,7 @@ class ScreenWrapper extends React.Component {
                                         style={styles.flex1}
                                         enabled={this.props.shouldEnablePickerAvoiding}
                                     >
-                                        <HeaderGap />
+                                        <HeaderGap styles={this.props.headerGapStyles} />
                                         {this.props.environment === CONST.ENVIRONMENT.DEV && <TestToolsModal />}
                                         {this.props.environment === CONST.ENVIRONMENT.DEV && <CustomDevMenu />}
                                         {
diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js
index 7162ca074f43..83033d9e97b7 100644
--- a/src/components/ScreenWrapper/propTypes.js
+++ b/src/components/ScreenWrapper/propTypes.js
@@ -36,6 +36,9 @@ const propTypes = {
     /** Whether to use the maxHeight (true) or use the 100% of the height (false) */
     shouldEnableMaxHeight: PropTypes.bool,
 
+    /** Array of additional styles for header gap */
+    headerGapStyles: PropTypes.arrayOf(PropTypes.object),
+
     ...windowDimensionsPropTypes,
 
     ...environmentPropTypes,
@@ -59,6 +62,7 @@ const defaultProps = {
     shouldEnablePickerAvoiding: true,
     shouldShowOfflineIndicator: true,
     offlineIndicatorStyle: [],
+    headerGapStyles: [],
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/SelectionList/BaseSelectionList.js b/src/components/SelectionList/BaseSelectionList.js
index 046b64e9e5c0..e57f00e1849c 100644
--- a/src/components/SelectionList/BaseSelectionList.js
+++ b/src/components/SelectionList/BaseSelectionList.js
@@ -1,7 +1,8 @@
-import React, {useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import SectionList from '../SectionList';
 import Text from '../Text';
 import styles from '../../styles/styles';
@@ -11,7 +12,7 @@ import CONST from '../../CONST';
 import variables from '../../styles/variables';
 import {propTypes as selectionListPropTypes} from './selectionListPropTypes';
 import RadioListItem from './RadioListItem';
-import CheckboxListItem from './CheckboxListItem';
+import UserListItem from './UserListItem';
 import useKeyboardShortcut from '../../hooks/useKeyboardShortcut';
 import SafeAreaConsumer from '../SafeAreaConsumer';
 import withKeyboardState, {keyboardStatePropTypes} from '../withKeyboardState';
@@ -42,7 +43,6 @@ function BaseSelectionList({
     keyboardType = CONST.KEYBOARD_TYPE.DEFAULT,
     onChangeText,
     initiallyFocusedOptionKey = '',
-    shouldDelayFocus = false,
     onScroll,
     onScrollBeginDrag,
     headerMessage = '',
@@ -61,6 +61,7 @@ function BaseSelectionList({
     const shouldShowTextInput = Boolean(textInputLabel);
     const shouldShowSelectAll = Boolean(onSelectAll);
     const activeElement = useActiveElement();
+    const isFocused = useIsFocused();
 
     /**
      * Iterates through the sections and items inside each section, and builds 3 arrays along the way:
@@ -242,16 +243,20 @@ function BaseSelectionList({
     };
 
     const renderItem = ({item, index, section}) => {
+        const normalizedIndex = index + lodashGet(section, 'indexOffset', 0);
         const isDisabled = section.isDisabled;
-        const isFocused = !isDisabled && focusedIndex === index + lodashGet(section, 'indexOffset', 0);
+        const isItemFocused = !isDisabled && focusedIndex === normalizedIndex;
+        // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
+        const showTooltip = normalizedIndex < 10;
 
         if (canSelectMultiple) {
             return (
-                <CheckboxListItem
+                <UserListItem
                     item={item}
-                    isFocused={isFocused}
+                    isFocused={isItemFocused}
                     onSelectRow={() => selectRow(item, index)}
                     onDismissError={onDismissError}
+                    showTooltip={showTooltip}
                 />
             );
         }
@@ -259,43 +264,40 @@ function BaseSelectionList({
         return (
             <RadioListItem
                 item={item}
-                isFocused={isFocused}
+                isFocused={isItemFocused}
                 isDisabled={isDisabled}
                 onSelectRow={() => selectRow(item, index)}
             />
         );
     };
 
-    /** Focuses the text input when the component mounts. If `props.shouldDelayFocus` is true, we wait for the animation to finish */
-    useEffect(() => {
-        if (shouldShowTextInput) {
-            if (shouldDelayFocus) {
+    /** Focuses the text input when the component comes into focus and after any navigation animations finish. */
+    useFocusEffect(
+        useCallback(() => {
+            if (shouldShowTextInput) {
                 focusTimeoutRef.current = setTimeout(() => textInputRef.current.focus(), CONST.ANIMATED_TRANSITION);
-            } else {
-                textInputRef.current.focus();
-            }
-        }
-
-        return () => {
-            if (!focusTimeoutRef.current) {
-                return;
             }
-            clearTimeout(focusTimeoutRef.current);
-        };
-    }, [shouldDelayFocus, shouldShowTextInput]);
+            return () => {
+                if (!focusTimeoutRef.current) {
+                    return;
+                }
+                clearTimeout(focusTimeoutRef.current);
+            };
+        }, [shouldShowTextInput]),
+    );
 
     /** Selects row when pressing Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedOption, {
         captureOnInputs: true,
         shouldBubble: () => !flattenedSections.allOptions[focusedIndex],
-        isActive: !activeElement,
+        isActive: !activeElement && isFocused,
     });
 
     /** Calls confirm action when pressing CTRL (CMD) + Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, onConfirm, {
         captureOnInputs: true,
         shouldBubble: () => !flattenedSections.allOptions[focusedIndex],
-        isActive: Boolean(onConfirm),
+        isActive: Boolean(onConfirm) && isFocused,
     });
 
     return (
@@ -346,6 +348,7 @@ function BaseSelectionList({
                                         accessibilityRole="button"
                                         accessibilityState={{checked: flattenedSections.allSelected}}
                                         disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     >
                                         <Checkbox
                                             accessibilityLabel={translate('workspace.people.selectAll')}
@@ -354,7 +357,7 @@ function BaseSelectionList({
                                             disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
                                         />
                                         <View style={[styles.flex1]}>
-                                            <Text style={[styles.textStrong, styles.ph5]}>{translate('workspace.people.selectAll')}</Text>
+                                            <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
                                         </View>
                                     </PressableWithFeedback>
                                 )}
diff --git a/src/components/SelectionList/CheckboxListItem.js b/src/components/SelectionList/CheckboxListItem.js
deleted file mode 100644
index 256182a38e8b..000000000000
--- a/src/components/SelectionList/CheckboxListItem.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import PressableWithFeedback from '../Pressable/PressableWithFeedback';
-import styles from '../../styles/styles';
-import Text from '../Text';
-import {checkboxListItemPropTypes} from './selectionListPropTypes';
-import Avatar from '../Avatar';
-import OfflineWithFeedback from '../OfflineWithFeedback';
-import CONST from '../../CONST';
-import * as StyleUtils from '../../styles/StyleUtils';
-import Icon from '../Icon';
-import * as Expensicons from '../Icon/Expensicons';
-import themeColors from '../../styles/themes/default';
-
-function CheckboxListItem({item, isFocused = false, onSelectRow, onDismissError = () => {}}) {
-    const hasError = !_.isEmpty(item.errors);
-
-    return (
-        <OfflineWithFeedback
-            onClose={() => onDismissError(item)}
-            pendingAction={item.pendingAction}
-            errors={item.errors}
-            errorRowStyles={styles.ph5}
-        >
-            <PressableWithFeedback
-                style={[styles.peopleRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive, hasError && styles.borderColorDanger]}
-                onPress={() => onSelectRow(item)}
-                disabled={item.isDisabled}
-                accessibilityLabel={item.text}
-                accessibilityRole="checkbox"
-                accessibilityState={{checked: item.isSelected}}
-                hoverDimmingValue={1}
-                hoverStyle={styles.hoveredComponentBG}
-                focusStyle={styles.hoveredComponentBG}
-            >
-                <View
-                    style={[
-                        StyleUtils.getCheckboxContainerStyle(20, 4),
-                        item.isSelected && styles.checkedContainer,
-                        item.isSelected && styles.borderColorFocus,
-                        item.isDisabled && styles.cursorDisabled,
-                        item.isDisabled && styles.buttonOpacityDisabled,
-                    ]}
-                >
-                    {item.isSelected && (
-                        <Icon
-                            src={Expensicons.Checkmark}
-                            fill={themeColors.textLight}
-                            height={14}
-                            width={14}
-                        />
-                    )}
-                </View>
-                {Boolean(item.avatar) && (
-                    <Avatar
-                        containerStyles={styles.pl5}
-                        source={lodashGet(item, 'avatar.source', '')}
-                        name={lodashGet(item, 'avatar.name', item.text)}
-                        type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
-                    />
-                )}
-                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
-                    <Text
-                        style={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.sidebarLinkTextBold]}
-                        numberOfLines={1}
-                    >
-                        {item.text}
-                    </Text>
-                    {Boolean(item.alternateText) && (
-                        <Text
-                            style={[isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                            numberOfLines={1}
-                        >
-                            {item.alternateText}
-                        </Text>
-                    )}
-                </View>
-                {Boolean(item.rightElement) && item.rightElement}
-            </PressableWithFeedback>
-        </OfflineWithFeedback>
-    );
-}
-
-CheckboxListItem.displayName = 'CheckboxListItem';
-CheckboxListItem.propTypes = checkboxListItemPropTypes;
-
-export default CheckboxListItem;
diff --git a/src/components/SelectionList/RadioListItem.js b/src/components/SelectionList/RadioListItem.js
index 92e3e84b66c8..df022992e24a 100644
--- a/src/components/SelectionList/RadioListItem.js
+++ b/src/components/SelectionList/RadioListItem.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
+import CONST from '../../CONST';
 import PressableWithFeedback from '../Pressable/PressableWithFeedback';
 import styles from '../../styles/styles';
 import Text from '../Text';
@@ -18,6 +19,7 @@ function RadioListItem({item, isFocused = false, isDisabled = false, onSelectRow
             hoverDimmingValue={1}
             hoverStyle={styles.hoveredComponentBG}
             focusStyle={styles.hoveredComponentBG}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
             <View style={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, styles.optionRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive]}>
                 <View style={[styles.flex1, styles.alignItemsStart]}>
diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js
new file mode 100644
index 000000000000..014e0cf879a5
--- /dev/null
+++ b/src/components/SelectionList/UserListItem.js
@@ -0,0 +1,112 @@
+import React from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import styles from '../../styles/styles';
+import Text from '../Text';
+import {userListItemPropTypes} from './selectionListPropTypes';
+import Avatar from '../Avatar';
+import OfflineWithFeedback from '../OfflineWithFeedback';
+import CONST from '../../CONST';
+import * as StyleUtils from '../../styles/StyleUtils';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import themeColors from '../../styles/themes/default';
+import Tooltip from '../Tooltip';
+import UserDetailsTooltip from '../UserDetailsTooltip';
+
+function UserListItem({item, isFocused = false, showTooltip, onSelectRow, onDismissError = () => {}}) {
+    const hasError = !_.isEmpty(item.errors);
+
+    const avatar = (
+        <Avatar
+            containerStyles={styles.pl3}
+            source={lodashGet(item, 'avatar.source', '')}
+            name={lodashGet(item, 'avatar.name', item.text)}
+            type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
+        />
+    );
+
+    const text = (
+        <Text
+            style={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.sidebarLinkTextBold]}
+            numberOfLines={1}
+        >
+            {item.text}
+        </Text>
+    );
+
+    const alternateText = (
+        <Text
+            style={[isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+            numberOfLines={1}
+        >
+            {item.alternateText}
+        </Text>
+    );
+
+    return (
+        <OfflineWithFeedback
+            onClose={() => onDismissError(item)}
+            pendingAction={item.pendingAction}
+            errors={item.errors}
+            errorRowStyles={styles.ph5}
+        >
+            <PressableWithFeedback
+                style={[styles.peopleRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive, hasError && styles.borderColorDanger]}
+                onPress={() => onSelectRow(item)}
+                disabled={item.isDisabled}
+                accessibilityLabel={item.text}
+                accessibilityRole="checkbox"
+                accessibilityState={{checked: item.isSelected}}
+                hoverDimmingValue={1}
+                hoverStyle={styles.hoveredComponentBG}
+                focusStyle={styles.hoveredComponentBG}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
+                <View style={styles.checkboxPressable}>
+                    <View
+                        style={[
+                            StyleUtils.getCheckboxContainerStyle(20, 4),
+                            item.isSelected && styles.checkedContainer,
+                            item.isSelected && styles.borderColorFocus,
+                            item.isDisabled && styles.cursorDisabled,
+                            item.isDisabled && styles.buttonOpacityDisabled,
+                        ]}
+                    >
+                        {item.isSelected && (
+                            <Icon
+                                src={Expensicons.Checkmark}
+                                fill={themeColors.textLight}
+                                height={14}
+                                width={14}
+                            />
+                        )}
+                    </View>
+                </View>
+                {Boolean(item.avatar) &&
+                    (showTooltip ? (
+                        <UserDetailsTooltip
+                            accountID={item.accountID}
+                            shiftHorizontal={styles.pl3.paddingLeft / 2}
+                        >
+                            <View>{avatar}</View>
+                        </UserDetailsTooltip>
+                    ) : (
+                        avatar
+                    ))}
+                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
+                    {showTooltip ? <Tooltip text={item.text}>{text}</Tooltip> : text}
+                    {Boolean(item.alternateText) && (showTooltip ? <Tooltip text={item.alternateText}>{alternateText}</Tooltip> : alternateText)}
+                </View>
+                {Boolean(item.rightElement) && item.rightElement}
+            </PressableWithFeedback>
+        </OfflineWithFeedback>
+    );
+}
+
+UserListItem.displayName = 'UserListItem';
+UserListItem.propTypes = userListItemPropTypes;
+
+export default UserListItem;
diff --git a/src/components/SelectionList/selectionListPropTypes.js b/src/components/SelectionList/selectionListPropTypes.js
index 9adf42833ebc..0a3c1efdf6a3 100644
--- a/src/components/SelectionList/selectionListPropTypes.js
+++ b/src/components/SelectionList/selectionListPropTypes.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import CONST from '../../CONST';
 
-const checkboxListItemPropTypes = {
+const userListItemPropTypes = {
     /** The section list item */
     item: PropTypes.shape({
         /** Text to display */
@@ -46,6 +46,9 @@ const checkboxListItemPropTypes = {
     /** Whether this item is focused (for arrow key controls) */
     isFocused: PropTypes.bool,
 
+    /** Whether this item should show Tooltip */
+    showTooltip: PropTypes.bool.isRequired,
+
     /** Callback to fire when the item is pressed */
     onSelectRow: PropTypes.func.isRequired,
 
@@ -90,7 +93,7 @@ const propTypes = {
             indexOffset: PropTypes.number,
 
             /** Array of options */
-            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(checkboxListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
+            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(userListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
 
             /** Whether this section items disabled for selection */
             isDisabled: PropTypes.bool,
@@ -130,9 +133,6 @@ const propTypes = {
     /** Item `keyForList` to focus initially */
     initiallyFocusedOptionKey: PropTypes.string,
 
-    /** Whether to delay focus on the text input when mounting. Used for a smoother animation on Android */
-    shouldDelayFocus: PropTypes.bool,
-
     /** Callback to fire when the list is scrolled */
     onScroll: PropTypes.func,
 
@@ -158,4 +158,4 @@ const propTypes = {
     showConfirmButton: PropTypes.bool,
 };
 
-export {propTypes, radioListItemPropTypes, checkboxListItemPropTypes};
+export {propTypes, radioListItemPropTypes, userListItemPropTypes};
diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js
index 21af004a0683..088b296b343a 100644
--- a/src/components/SettlementButton.js
+++ b/src/components/SettlementButton.js
@@ -1,21 +1,20 @@
+import React, {useEffect, useMemo} from 'react';
 import _ from 'underscore';
-import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
-import * as Expensicons from './Icon/Expensicons';
-import Permissions from '../libs/Permissions';
-import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
 import compose from '../libs/compose';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import Permissions from '../libs/Permissions';
+import useNetwork from '../hooks/useNetwork';
+import useLocalize from '../hooks/useLocalize';
+import * as ReportUtils from '../libs/ReportUtils';
+import iouReportPropTypes from '../pages/iouReportPropTypes';
 import * as PaymentMethods from '../libs/actions/PaymentMethods';
 import KYCWall from './KYCWall';
 import withNavigation from './withNavigation';
-import {withNetwork} from './OnyxProvider';
-import networkPropTypes from './networkPropTypes';
-import iouReportPropTypes from '../pages/iouReportPropTypes';
-import * as ReportUtils from '../libs/ReportUtils';
+import * as Expensicons from './Icon/Expensicons';
+import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 
 const propTypes = {
     /** Callback to execute when this button is pressed. Receives a single payment type argument. */
@@ -24,12 +23,6 @@ const propTypes = {
     /** Settlement currency type */
     currency: PropTypes.string,
 
-    /** Should we show paypal option */
-    shouldShowPaypal: PropTypes.bool,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** When the button is opened via an IOU, ID for the chatReport that the IOU is linked to */
     chatReportID: PropTypes.string,
 
@@ -60,25 +53,40 @@ const propTypes = {
     /** The size of button size */
     buttonSize: PropTypes.oneOf(_.values(CONST.DROPDOWN_BUTTON_SIZE)),
 
-    /** The anchor alignment of the popover menu */
+    /** Route for the Add Bank Account screen for a given navigation stack */
+    addBankAccountRoute: PropTypes.string,
+
+    /** Route for the Add Debit Card screen for a given navigation stack */
+    addDebitCardRoute: PropTypes.string,
+
+    /** Whether the button should be disabled */
+    isDisabled: PropTypes.bool,
+
+    /** Whether we should show a loading state for the main button */
+    isLoading: PropTypes.bool,
 
+    /** The anchor alignment of the popover menu */
     anchorAlignment: PropTypes.shape({
         horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
         vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
     }),
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
+    isLoading: false,
+    isDisabled: false,
+    addBankAccountRoute: '',
+    addDebitCardRoute: '',
     currency: CONST.CURRENCY.USD,
-    shouldShowPaypal: false,
     chatReportID: '',
-    betas: [],
+
+    // The "betas" array, "iouReport" and "nvp_lastPaymentMethod" objects needs to be stable to prevent the "useMemo"
+    // hook from being recreated unnecessarily, hence the use of CONST.EMPTY_ARRAY and CONST.EMPTY_OBJECT
+    betas: CONST.EMPTY_ARRAY,
+    iouReport: CONST.EMPTY_OBJECT,
+    nvp_lastPaymentMethod: CONST.EMPTY_OBJECT,
     shouldShowPaymentOptions: false,
-    nvp_lastPaymentMethod: {},
     style: [],
-    iouReport: {},
     policyID: '',
     formattedAmount: '',
     buttonSize: CONST.DROPDOWN_BUTTON_SIZE.MEDIUM,
@@ -88,43 +96,58 @@ const defaultProps = {
     },
 };
 
-class SettlementButton extends React.Component {
-    componentDidMount() {
+function SettlementButton({
+    addDebitCardRoute,
+    addBankAccountRoute,
+    anchorAlignment,
+    betas,
+    buttonSize,
+    chatReportID,
+    currency,
+    enablePaymentsRoute,
+    iouReport,
+    isDisabled,
+    isLoading,
+    formattedAmount,
+    nvp_lastPaymentMethod,
+    onPress,
+    policyID,
+    shouldShowPaymentOptions,
+    style,
+}) {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+
+    useEffect(() => {
         PaymentMethods.openWalletPage();
-    }
+    }, []);
 
-    getButtonOptionsFromProps() {
+    const paymentButtonOptions = useMemo(() => {
         const buttonOptions = [];
-        const isExpenseReport = ReportUtils.isExpenseReport(this.props.iouReport);
+        const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
         const paymentMethods = {
             [CONST.IOU.PAYMENT_TYPE.EXPENSIFY]: {
-                text: this.props.translate('iou.settleExpensify', {formattedAmount: this.props.formattedAmount || ''}),
+                text: translate('iou.settleExpensify', {formattedAmount}),
                 icon: Expensicons.Wallet,
                 value: CONST.IOU.PAYMENT_TYPE.EXPENSIFY,
             },
             [CONST.IOU.PAYMENT_TYPE.VBBA]: {
-                text: this.props.translate('iou.settleExpensify', {formattedAmount: this.props.formattedAmount || ''}),
+                text: translate('iou.settleExpensify', {formattedAmount}),
                 icon: Expensicons.Wallet,
                 value: CONST.IOU.PAYMENT_TYPE.VBBA,
             },
-            [CONST.IOU.PAYMENT_TYPE.PAYPAL_ME]: {
-                text: this.props.translate('iou.settlePaypalMe', {formattedAmount: this.props.formattedAmount || ''}),
-                icon: Expensicons.PayPal,
-                value: CONST.IOU.PAYMENT_TYPE.PAYPAL_ME,
-            },
             [CONST.IOU.PAYMENT_TYPE.ELSEWHERE]: {
-                text: this.props.translate('iou.payElsewhere'),
+                text: translate('iou.payElsewhere'),
                 icon: Expensicons.Cash,
                 value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
             },
         };
-        const canUseWallet =
-            !isExpenseReport && this.props.currency === CONST.CURRENCY.USD && Permissions.canUsePayWithExpensify(this.props.betas) && Permissions.canUseWallet(this.props.betas);
+        const canUseWallet = !isExpenseReport && currency === CONST.CURRENCY.USD && Permissions.canUsePayWithExpensify(betas) && Permissions.canUseWallet(betas);
 
         // To achieve the one tap pay experience we need to choose the correct payment type as default,
         // if user already paid for some request or expense, let's use the last payment method or use default.
-        let paymentMethod = this.props.nvp_lastPaymentMethod[this.props.policyID] || '';
-        if (!this.props.shouldShowPaymentOptions) {
+        let paymentMethod = nvp_lastPaymentMethod[policyID] || '';
+        if (!shouldShowPaymentOptions) {
             if (!paymentMethod) {
                 // In case the user hasn't paid a request yet, let's default to VBBA payment type in case of expense reports
                 if (isExpenseReport) {
@@ -137,16 +160,11 @@ class SettlementButton extends React.Component {
                 }
             }
 
-            // In case the last payment method has been PayPal, but this request is made in currency unsupported by Paypal, default to Elsewhere
-            if (paymentMethod === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME && !_.includes(CONST.PAYPAL_SUPPORTED_CURRENCIES, this.props.currency)) {
-                paymentMethod = CONST.IOU.PAYMENT_TYPE.ELSEWHERE;
-            }
-
             // In case of the settlement button in the report preview component, we do not show payment options and the label for Wallet and ACH type is simply "Pay".
             return [
                 {
                     ...paymentMethods[paymentMethod],
-                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? this.props.translate('iou.payElsewhere') : this.props.translate('iou.pay'),
+                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? translate('iou.payElsewhere') : translate('iou.pay'),
                 },
             ];
         }
@@ -156,9 +174,6 @@ class SettlementButton extends React.Component {
         if (isExpenseReport) {
             buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.VBBA]);
         }
-        if (this.props.shouldShowPaypal && _.includes(CONST.PAYPAL_SUPPORTED_CURRENCIES, this.props.currency)) {
-            buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.PAYPAL_ME]);
-        }
         buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);
 
         // Put the preferred payment method to the front of the array so its shown as default
@@ -166,50 +181,49 @@ class SettlementButton extends React.Component {
             return _.sortBy(buttonOptions, (method) => (method.value === paymentMethod ? 0 : 1));
         }
         return buttonOptions;
-    }
-
-    render() {
-        return (
-            <KYCWall
-                onSuccessfulKYC={(iouPaymentType) => this.props.onPress(iouPaymentType)}
-                enablePaymentsRoute={this.props.enablePaymentsRoute}
-                addBankAccountRoute={this.props.addBankAccountRoute}
-                addDebitCardRoute={this.props.addDebitCardRoute}
-                isDisabled={this.props.network.isOffline}
-                chatReportID={this.props.chatReportID}
-                iouReport={this.props.iouReport}
-            >
-                {(triggerKYCFlow, buttonRef) => (
-                    <ButtonWithDropdownMenu
-                        buttonRef={buttonRef}
-                        isDisabled={this.props.isDisabled}
-                        isLoading={this.props.isLoading}
-                        onPress={(event, iouPaymentType) => {
-                            if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
-                                triggerKYCFlow(event, iouPaymentType);
-                                return;
-                            }
-
-                            this.props.onPress(iouPaymentType);
-                        }}
-                        options={this.getButtonOptionsFromProps()}
-                        style={this.props.style}
-                        buttonSize={this.props.buttonSize}
-                        anchorAlignment={this.props.anchorAlignment}
-                    />
-                )}
-            </KYCWall>
-        );
-    }
+    }, [betas, currency, formattedAmount, iouReport, nvp_lastPaymentMethod, policyID, shouldShowPaymentOptions, translate]);
+
+    const selectPaymentType = (event, iouPaymentType, triggerKYCFlow) => {
+        if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
+            triggerKYCFlow(event, iouPaymentType);
+            return;
+        }
+
+        onPress(iouPaymentType);
+    };
+
+    return (
+        <KYCWall
+            onSuccessfulKYC={onPress}
+            enablePaymentsRoute={enablePaymentsRoute}
+            addBankAccountRoute={addBankAccountRoute}
+            addDebitCardRoute={addDebitCardRoute}
+            isDisabled={isOffline}
+            chatReportID={chatReportID}
+            iouReport={iouReport}
+        >
+            {(triggerKYCFlow, buttonRef) => (
+                <ButtonWithDropdownMenu
+                    buttonRef={buttonRef}
+                    isDisabled={isDisabled}
+                    isLoading={isLoading}
+                    onPress={(event, iouPaymentType) => selectPaymentType(event, iouPaymentType, triggerKYCFlow)}
+                    options={paymentButtonOptions}
+                    style={style}
+                    buttonSize={buttonSize}
+                    anchorAlignment={anchorAlignment}
+                />
+            )}
+        </KYCWall>
+    );
 }
 
 SettlementButton.propTypes = propTypes;
 SettlementButton.defaultProps = defaultProps;
+SettlementButton.displayName = 'SettlementButton';
 
 export default compose(
     withNavigation,
-    withLocalize,
-    withNetwork(),
     withOnyx({
         betas: {
             key: ONYXKEYS.BETAS,
diff --git a/src/components/ShowContextMenuContext.js b/src/components/ShowContextMenuContext.js
index df522dec8f10..fff233162d74 100644
--- a/src/components/ShowContextMenuContext.js
+++ b/src/components/ShowContextMenuContext.js
@@ -2,6 +2,7 @@ import React from 'react';
 import * as ReportActionContextMenu from '../pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as ContextMenuActions from '../pages/home/report/ContextMenu/ContextMenuActions';
 import * as DeviceCapabilities from '../libs/DeviceCapabilities';
+import * as ReportUtils from '../libs/ReportUtils';
 
 const ShowContextMenuContext = React.createContext({
     anchor: null,
@@ -32,7 +33,8 @@ function showContextMenuForReport(event, anchor, reportID, action, checkIfContex
         '',
         anchor,
         reportID,
-        action,
+        action.reportActionID,
+        ReportUtils.getOriginalReportID(reportID, action),
         '',
         checkIfContextMenuActive,
         checkIfContextMenuActive,
diff --git a/src/components/SignInButtons/GoogleSignIn/index.website.js b/src/components/SignInButtons/GoogleSignIn/index.website.js
index 33d6a2e382c9..5362433142af 100644
--- a/src/components/SignInButtons/GoogleSignIn/index.website.js
+++ b/src/components/SignInButtons/GoogleSignIn/index.website.js
@@ -68,6 +68,8 @@ function GoogleSignIn({translate, isDesktopFlow}) {
         };
     }, [loadScript]);
 
+    // willChangeTransform is used to prevent the icon cut in safari when the overflow hidden and width given to the parent
+    // ref: https://stackoverflow.com/questions/75306089/safari-when-using-border-radius-and-overflow-hidden-to-parent-and-the-child-th
     return isDesktopFlow ? (
         <View style={styles.googlePillButtonContainer}>
             <div
@@ -77,7 +79,7 @@ function GoogleSignIn({translate, isDesktopFlow}) {
             />
         </View>
     ) : (
-        <View style={styles.googleButtonContainer}>
+        <View style={[styles.googleButtonContainer, styles.willChangeTransform]}>
             <div
                 id={mainId}
                 role="button"
diff --git a/src/components/SignInPageForm/index.js b/src/components/SignInPageForm/index.js
index 9db9ffea0e6a..5a1e5a62ff23 100644
--- a/src/components/SignInPageForm/index.js
+++ b/src/components/SignInPageForm/index.js
@@ -1,51 +1,47 @@
-import React from 'react';
+import React, {useEffect, useRef} from 'react';
 import FormElement from '../FormElement';
 
-class Form extends React.Component {
-    constructor(props) {
-        super(props);
+const preventFormDefault = (event) => {
+    // When enter is pressed form is submitted to action url (POST /).
+    // As we are using controlled component, we need to disable it here.
+    event.preventDefault();
+};
 
-        this.preventFormDefault = this.preventFormDefault.bind(this);
-    }
+function Form(props) {
+    const form = useRef(null);
 
-    componentDidMount() {
-        if (!this.form) {
+    useEffect(() => {
+        const formCurrent = form.current;
+
+        if (!formCurrent) {
             return;
         }
 
         // Prevent the browser from applying its own validation, which affects the email input
-        this.form.setAttribute('novalidate', '');
+        formCurrent.setAttribute('novalidate', '');
 
         // Password Managers need these attributes to be able to identify the form elements properly.
-        this.form.setAttribute('method', 'post');
-        this.form.setAttribute('action', '/');
-
-        this.form.addEventListener('submit', this.preventFormDefault);
-    }
-
-    componentWillUnmount() {
-        if (!this.form) {
-            return;
-        }
-
-        this.form.removeEventListener('submit', this.preventFormDefault);
-    }
-
-    preventFormDefault(event) {
-        // When enter is pressed form is submitted to action url (POST /).
-        // As we are using controlled component, we need to disable it here.
-        event.preventDefault();
-    }
-
-    render() {
-        return (
-            <FormElement
-                ref={(el) => (this.form = el)}
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...this.props}
-            />
-        );
-    }
+        formCurrent.setAttribute('method', 'post');
+        formCurrent.setAttribute('action', '/');
+        formCurrent.addEventListener('submit', preventFormDefault);
+
+        return () => {
+            if (!formCurrent) {
+                return;
+            }
+            formCurrent.removeEventListener('submit', preventFormDefault);
+        };
+    }, []);
+
+    return (
+        <FormElement
+            ref={form}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
 }
 
+Form.displayName = 'Form';
+
 export default Form;
diff --git a/src/components/StatePicker/StateSelectorModal.js b/src/components/StatePicker/StateSelectorModal.js
index 91ee1b225a1f..bea335840c53 100644
--- a/src/components/StatePicker/StateSelectorModal.js
+++ b/src/components/StatePicker/StateSelectorModal.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
-import React, {useMemo} from 'react';
+import React, {useMemo, useEffect} from 'react';
 import PropTypes from 'prop-types';
+import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import CONST from '../../CONST';
 import Modal from '../Modal';
 import HeaderWithBackButton from '../HeaderWithBackButton';
@@ -44,15 +45,26 @@ const defaultProps = {
 function StateSelectorModal({currentState, isVisible, onClose, onStateSelected, searchValue, setSearchValue, label}) {
     const {translate} = useLocalize();
 
+    useEffect(() => {
+        if (isVisible) {
+            return;
+        }
+        setSearchValue('');
+    }, [isVisible, setSearchValue]);
+
     const countryStates = useMemo(
         () =>
-            _.map(translate('allStates'), (state) => ({
-                value: state.stateISO,
-                keyForList: state.stateISO,
-                text: state.stateName,
-                isSelected: currentState === state.stateISO,
-                searchValue: StringUtils.sanitizeString(`${state.stateISO}${state.stateName}`),
-            })),
+            _.map(_.keys(COMMON_CONST.STATES), (state) => {
+                const stateName = translate(`allStates.${state}.stateName`);
+                const stateISO = translate(`allStates.${state}.stateISO`);
+                return {
+                    value: stateISO,
+                    keyForList: stateISO,
+                    text: stateName,
+                    isSelected: currentState === stateISO,
+                    searchValue: StringUtils.sanitizeString(`${stateISO}${stateName}`),
+                };
+            }),
         [translate, currentState],
     );
 
@@ -81,12 +93,10 @@ function StateSelectorModal({currentState, isVisible, onClose, onStateSelected,
                 <SelectionList
                     headerMessage={headerMessage}
                     textInputLabel={label || translate('common.state')}
-                    textInputPlaceholder={translate('stateSelectorModal.placeholderText')}
                     textInputValue={searchValue}
                     sections={[{data: searchResults, indexOffset: 0}]}
                     onSelectRow={onStateSelected}
                     onChangeText={setSearchValue}
-                    shouldDelayFocus
                     initiallyFocusedOptionKey={currentState}
                 />
             </ScreenWrapper>
diff --git a/src/components/StatePicker/index.js b/src/components/StatePicker/index.js
index 5f3241181ee0..142654b82cd1 100644
--- a/src/components/StatePicker/index.js
+++ b/src/components/StatePicker/index.js
@@ -1,7 +1,8 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
-import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
+import _ from 'underscore';
+import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import styles from '../../styles/styles';
 import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
 import useLocalize from '../../hooks/useLocalize';
@@ -36,16 +37,10 @@ const defaultProps = {
 
 function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
     const {translate} = useLocalize();
-    const allStates = translate('allStates');
     const [isPickerVisible, setIsPickerVisible] = useState(false);
-    const [searchValue, setSearchValue] = useState(lodashGet(allStates, `${value}.stateName`, ''));
-
-    useEffect(() => {
-        setSearchValue(lodashGet(allStates, `${value}.stateName`, ''));
-    }, [value, allStates]);
+    const [searchValue, setSearchValue] = useState('');
 
     const showPickerModal = () => {
-        setSearchValue(lodashGet(allStates, `${value}.stateName`, ''));
         setIsPickerVisible(true);
     };
 
@@ -58,7 +53,7 @@ function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
         hidePickerModal();
     };
 
-    const title = allStates[value] ? allStates[value].stateName : '';
+    const title = value && _.keys(COMMON_CONST.STATES).includes(value) ? translate(`allStates.${value}.stateName`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index 05202e720bd4..038484e3f42d 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -38,7 +38,7 @@ const defaultProps = {
 
 function SubscriptAvatar(props) {
     const isSmall = props.size === CONST.AVATAR_SIZE.SMALL;
-    const subscriptSyle = props.size === CONST.AVATAR_SIZE.SMALL_NORMAL ? styles.secondAvatarSubscriptSmallNormal : styles.secondAvatarSubscript;
+    const subscriptStyle = props.size === CONST.AVATAR_SIZE.SMALL_NORMAL ? styles.secondAvatarSubscriptSmallNormal : styles.secondAvatarSubscript;
     const containerStyle = isSmall ? styles.emptyAvatarSmall : styles.emptyAvatar;
     // Default the margin style to what is normal for small or normal sized avatars
     let marginStyle = isSmall ? styles.emptyAvatarMarginSmall : styles.emptyAvatarMargin;
@@ -67,9 +67,13 @@ function SubscriptAvatar(props) {
                 accountID={lodashGet(props.secondaryAvatar, 'id', -1)}
                 icon={props.secondaryAvatar}
             >
-                <View style={props.size === CONST.AVATAR_SIZE.SMALL_NORMAL ? styles.flex1 : {}}>
+                <View
+                    style={[props.size === CONST.AVATAR_SIZE.SMALL_NORMAL ? styles.flex1 : {}, isSmall ? styles.secondAvatarSubscriptCompact : subscriptStyle]}
+                    // Hover on overflowed part of icon will not work on Electron if dragArea is true
+                    // https://stackoverflow.com/questions/56338939/hover-in-css-is-not-working-with-electron
+                    dataSet={{dragArea: false}}
+                >
                     <Avatar
-                        containerStyles={[isSmall ? styles.secondAvatarSubscriptCompact : subscriptSyle]}
                         iconAdditionalStyles={[
                             StyleUtils.getAvatarBorderWidth(isSmall ? CONST.AVATAR_SIZE.SMALL_SUBSCRIPT : CONST.AVATAR_SIZE.SUBSCRIPT),
                             StyleUtils.getBorderColorStyle(props.backgroundColor),
diff --git a/src/components/Switch.js b/src/components/Switch.js
index 3b7f464b00e5..5c8a0da925f3 100644
--- a/src/components/Switch.js
+++ b/src/components/Switch.js
@@ -4,6 +4,7 @@ import {Animated} from 'react-native';
 import CONST from '../CONST';
 import styles from '../styles/styles';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
+import useNativeDriver from '../libs/useNativeDriver';
 
 const propTypes = {
     /** Whether the switch is toggled to the on position */
@@ -28,7 +29,7 @@ function Switch(props) {
         Animated.timing(offsetX.current, {
             toValue: props.isOn ? OFFSET_X.ON : OFFSET_X.OFF,
             duration: 300,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [props.isOn]);
 
diff --git a/src/components/TabSelector/TabIcon.js b/src/components/TabSelector/TabIcon.js
index dae8d6057d3f..85f1cd912ff6 100644
--- a/src/components/TabSelector/TabIcon.js
+++ b/src/components/TabSelector/TabIcon.js
@@ -9,10 +9,12 @@ const propTypes = {
     icon: PropTypes.func,
 
     /** Animated opacity value while the label is inactive state */
-    inactiveOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    inactiveOpacity: PropTypes.any,
 
     /** Animated opacity value while the label is in active state */
-    activeOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    activeOpacity: PropTypes.any,
 };
 
 const defaultProps = {
diff --git a/src/components/TabSelector/TabLabel.js b/src/components/TabSelector/TabLabel.js
index 890286b2ee1d..32c8a384d814 100644
--- a/src/components/TabSelector/TabLabel.js
+++ b/src/components/TabSelector/TabLabel.js
@@ -8,10 +8,12 @@ const propTypes = {
     title: PropTypes.string,
 
     /** Animated opacity value while the label is inactive state */
-    inactiveOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    inactiveOpacity: PropTypes.any,
 
     /** Animated opacity value while the label is in active state */
-    activeOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    activeOpacity: PropTypes.any,
 };
 
 const defaultProps = {
diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
index d50744682027..79cd1a6dd17d 100644
--- a/src/components/TabSelector/TabSelector.js
+++ b/src/components/TabSelector/TabSelector.js
@@ -36,25 +36,20 @@ const defaultProps = {
     },
 };
 
-const getIcon = (route) => {
+const getIconAndTitle = (route, translate) => {
     switch (route) {
+        case CONST.TAB.MANUAL:
+            return {icon: Expensicons.Pencil, title: translate('tabSelector.manual')};
         case CONST.TAB.SCAN:
-            return Expensicons.Receipt;
+            return {icon: Expensicons.Receipt, title: translate('tabSelector.scan')};
+        case CONST.TAB.NEW_CHAT:
+            return {icon: Expensicons.User, title: translate('tabSelector.chat')};
+        case CONST.TAB.NEW_ROOM:
+            return {icon: Expensicons.Hashtag, title: translate('tabSelector.room')};
         case CONST.TAB.DISTANCE:
-            return Expensicons.Car;
+            return {icon: Expensicons.Car, title: translate('common.distance')};
         default:
-            return Expensicons.Pencil;
-    }
-};
-
-const getTitle = (route, translate) => {
-    switch (route) {
-        case CONST.TAB.SCAN:
-            return translate('tabSelector.scan');
-        case CONST.TAB.DISTANCE:
-            return translate('common.distance');
-        default:
-            return translate('tabSelector.manual');
+            throw new Error(`Route ${route} has no icon nor title set.`);
     }
 };
 
@@ -79,10 +74,10 @@ const getBackgroundColor = (position, routesLength, tabIndex) => {
 
         return position.interpolate({
             inputRange,
-            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.midtone : themeColors.appBG)),
+            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.border : themeColors.appBG)),
         });
     }
-    return themeColors.midtone;
+    return themeColors.border;
 };
 
 function TabSelector({state, navigation, onTabPress, position}) {
@@ -94,17 +89,21 @@ function TabSelector({state, navigation, onTabPress, position}) {
                 const activeOpacity = getOpacity(position, state.routes.length, index, true);
                 const inactiveOpacity = getOpacity(position, state.routes.length, index, false);
                 const backgroundColor = getBackgroundColor(position, state.routes.length, index);
-
                 const isFocused = index === state.index;
+                const {icon, title} = getIconAndTitle(route.name, translate);
 
                 const onPress = () => {
+                    if (isFocused) {
+                        return;
+                    }
+
                     const event = navigation.emit({
                         type: 'tabPress',
                         target: route.key,
                         canPreventDefault: true,
                     });
 
-                    if (!isFocused && !event.defaultPrevented) {
+                    if (!event.defaultPrevented) {
                         // The `merge: true` option makes sure that the params inside the tab screen are preserved
                         navigation.navigate({name: route.name, merge: true});
                     }
@@ -115,8 +114,8 @@ function TabSelector({state, navigation, onTabPress, position}) {
                 return (
                     <TabSelectorItem
                         key={route.name}
-                        title={getTitle(route.name, translate)}
-                        icon={getIcon(route.name)}
+                        icon={icon}
+                        title={title}
                         onPress={onPress}
                         activeOpacity={activeOpacity}
                         inactiveOpacity={inactiveOpacity}
diff --git a/src/components/TabSelector/TabSelectorItem.js b/src/components/TabSelector/TabSelectorItem.js
index 6f96c5ef5d0a..d0ea8fcc773b 100644
--- a/src/components/TabSelector/TabSelectorItem.js
+++ b/src/components/TabSelector/TabSelectorItem.js
@@ -21,10 +21,12 @@ const propTypes = {
     backgroundColor: PropTypes.any,
 
     /** Animated opacity value while the label is inactive state */
-    inactiveOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    inactiveOpacity: PropTypes.any,
 
     /** Animated opacity value while the label is in active state */
-    activeOpacity: PropTypes.number,
+    // eslint-disable-next-line
+    activeOpacity: PropTypes.any,
 };
 
 const defaultProps = {
diff --git a/src/components/TagPicker/index.js b/src/components/TagPicker/index.js
new file mode 100644
index 000000000000..25021bd817d7
--- /dev/null
+++ b/src/components/TagPicker/index.js
@@ -0,0 +1,90 @@
+import React, {useMemo} from 'react';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+import styles from '../../styles/styles';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
+import useLocalize from '../../hooks/useLocalize';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import OptionsSelector from '../OptionsSelector';
+import {propTypes, defaultProps} from './tagPickerPropTypes';
+
+function TagPicker({policyTags, reportID, tag, iouType, iou}) {
+    const {translate} = useLocalize();
+
+    const selectedOptions = useMemo(() => {
+        if (!iou.tag) {
+            return [];
+        }
+
+        return [
+            {
+                name: iou.tag,
+                enabled: true,
+            },
+        ];
+    }, [iou.tag]);
+
+    // Only shows one section, which will be the default behavior if there are
+    // less than 8 policy tags
+    // TODO: support sections with search
+    const sections = useMemo(() => {
+        const tagList = _.chain(lodashGet(policyTags, [tag, 'tags'], {}))
+            .values()
+            .map((t) => ({
+                text: t.name,
+                keyForList: t.name,
+                tooltipText: t.name,
+            }))
+            .value();
+
+        return [
+            {
+                data: tagList,
+            },
+        ];
+    }, [policyTags, tag]);
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, '');
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+    };
+
+    const updateTag = () => {
+        // TODO: add logic to save the selected tag
+        navigateBack();
+    };
+
+    return (
+        <OptionsSelector
+            optionHoveredStyle={styles.hoveredComponentBG}
+            sections={sections}
+            selectedOptions={selectedOptions}
+            headerMessage={headerMessage}
+            textInputLabel={translate('common.search')}
+            boldStyle
+            value=""
+            onSelectRow={updateTag}
+            shouldShowTextInput={false}
+        />
+    );
+}
+
+TagPicker.displayName = 'TagPicker';
+TagPicker.propTypes = propTypes;
+TagPicker.defaultProps = defaultProps;
+
+export default withOnyx({
+    policyTags: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+    },
+    policyRecentlyUsedTags: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${policyID}`,
+    },
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
+})(TagPicker);
diff --git a/src/components/TagPicker/tagPickerPropTypes.js b/src/components/TagPicker/tagPickerPropTypes.js
new file mode 100644
index 000000000000..ad57a0409f15
--- /dev/null
+++ b/src/components/TagPicker/tagPickerPropTypes.js
@@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import tagPropTypes from '../tagPropTypes';
+import {iouPropTypes, iouDefaultProps} from '../../pages/iou/propTypes';
+
+const propTypes = {
+    /** The report ID of the IOU */
+    reportID: PropTypes.string.isRequired,
+
+    /** The policyID we are getting tags for */
+    policyID: PropTypes.string.isRequired,
+
+    /** The name of tag list we are getting tags for */
+    tag: PropTypes.string.isRequired,
+
+    /** The type of IOU report, i.e. bill, request, send */
+    iouType: PropTypes.string.isRequired,
+
+    /** Callback to submit the selected tag */
+    onSubmit: PropTypes.func,
+
+    /* Onyx Props */
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
+
+    /** List of recently used tags */
+    policyRecentlyUsedTags: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.string)),
+
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
+};
+
+const defaultProps = {
+    policyTags: {},
+    policyRecentlyUsedTags: {},
+    iou: iouDefaultProps,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index c3f1cec4ef1a..ec22b09dde04 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -20,6 +20,7 @@ import FormHelpMessage from '../FormHelpMessage';
 import isInputAutoFilled from '../../libs/isInputAutoFilled';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 import withLocalize from '../withLocalize';
+import useNativeDriver from '../../libs/useNativeDriver';
 
 function BaseTextInput(props) {
     const inputValue = props.value || props.defaultValue || '';
@@ -29,7 +30,6 @@ function BaseTextInput(props) {
     const [passwordHidden, setPasswordHidden] = useState(props.secureTextEntry);
     const [textInputWidth, setTextInputWidth] = useState(0);
     const [textInputHeight, setTextInputHeight] = useState(0);
-    const [prefixWidth, setPrefixWidth] = useState(0);
     const [height, setHeight] = useState(variables.componentSizeLarge);
     const [width, setWidth] = useState();
     const labelScale = useRef(new Animated.Value(initialActiveLabel ? styleConst.ACTIVE_LABEL_SCALE : styleConst.INACTIVE_LABEL_SCALE)).current;
@@ -86,12 +86,12 @@ function BaseTextInput(props) {
                 Animated.spring(labelTranslateY, {
                     toValue: translateY,
                     duration: styleConst.LABEL_ANIMATION_DURATION,
-                    useNativeDriver: true,
+                    useNativeDriver,
                 }),
                 Animated.spring(labelScale, {
                     toValue: scale,
                     duration: styleConst.LABEL_ANIMATION_DURATION,
-                    useNativeDriver: true,
+                    useNativeDriver,
                 }),
             ]).start();
         },
@@ -132,12 +132,6 @@ function BaseTextInput(props) {
             props.onBlur(event);
         }
         setIsFocused(false);
-
-        // If the text has been supplied by Chrome autofill, the value state is not synced with the value
-        // as Chrome doesn't trigger a change event. When there is autofill text, don't deactivate label.
-        if (!isInputAutoFilled(input.current)) {
-            deactivateLabel();
-        }
     };
 
     const onPress = (event) => {
@@ -190,7 +184,13 @@ function BaseTextInput(props) {
         // We can't use inputValue here directly, as it might contain
         // the defaultValue, which doesn't get updated when the text changes.
         // We can't use props.value either, as it might be undefined.
-        if (hasValueRef.current || isFocused || isInputAutoFilled(input.current)) {
+        if (
+            hasValueRef.current ||
+            isFocused ||
+            // If the text has been supplied by Chrome autofill, the value state is not synced with the value
+            // as Chrome doesn't trigger a change event. When there is autofill text, keep the label activated.
+            isInputAutoFilled(input.current)
+        ) {
             activateLabel();
         } else {
             deactivateLabel();
@@ -221,9 +221,20 @@ function BaseTextInput(props) {
         setPasswordHidden((prevPasswordHidden) => !prevPasswordHidden);
     }, []);
 
-    const storePrefixLayoutDimensions = useCallback((event) => {
-        setPrefixWidth(Math.abs(event.nativeEvent.layout.width));
-    }, []);
+    // When adding a new prefix character, adjust this method to add expected character width.
+    // This is because character width isn't known before it's rendered to the screen, and once it's rendered,
+    // it's too late to calculate it's width because the change in padding would cause a visible jump.
+    // Some characters are wider than the others when rendered, e.g. '@' vs '#'. Chosen font-family and font-size
+    // also have an impact on the width of the character, but as long as there's only one font-family and one font-size,
+    // this method will produce reliable results.
+    const getCharacterPadding = (prefix) => {
+        switch (prefix) {
+            case CONST.POLICY.ROOM_PREFIX:
+                return 10;
+            default:
+                throw new Error(`Prefix ${prefix} has no padding assigned.`);
+        }
+    };
 
     // eslint-disable-next-line react/forbid-foreign-prop-types
     const inputProps = _.omit(props, _.keys(baseTextInputPropTypes.propTypes));
@@ -295,7 +306,7 @@ function BaseTextInput(props) {
                                         pointerEvents="none"
                                         selectable={false}
                                         style={[styles.textInputPrefix, !hasLabel && styles.pv0]}
-                                        onLayout={storePrefixLayoutDimensions}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     >
                                         {props.prefixCharacter}
                                     </Text>
@@ -322,7 +333,7 @@ function BaseTextInput(props) {
                                     styles.w100,
                                     props.inputStyle,
                                     (!hasLabel || isMultiline) && styles.pv0,
-                                    props.prefixCharacter && StyleUtils.getPaddingLeft(prefixWidth + styles.pl1.paddingLeft),
+                                    props.prefixCharacter && StyleUtils.getPaddingLeft(getCharacterPadding(props.prefixCharacter) + styles.pl1.paddingLeft),
                                     props.secureTextEntry && styles.secureInput,
 
                                     // Explicitly remove `lineHeight` from single line inputs so that long text doesn't disappear
@@ -331,6 +342,8 @@ function BaseTextInput(props) {
 
                                     // Stop scrollbar flashing when breaking lines with autoGrowHeight enabled.
                                     props.autoGrowHeight && StyleUtils.getAutoGrowHeightInputStyle(textInputHeight, maxHeight),
+                                    // Add disabled color theme when field is not editable.
+                                    props.disabled && styles.textInputDisabled,
                                 ]}
                                 multiline={isMultiline}
                                 maxLength={props.maxLength}
diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.js b/src/components/Tooltip/TooltipRenderedOnPageBody.js
index c8624421f871..f61ecaee1059 100644
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.js
+++ b/src/components/Tooltip/TooltipRenderedOnPageBody.js
@@ -86,6 +86,7 @@ function TooltipRenderedOnPageBody(props) {
     const {animationStyle, rootWrapperStyle, textStyle, pointerWrapperStyle, pointerStyle} = useMemo(
         () =>
             getTooltipStyles(
+                rootWrapper.current,
                 props.animation,
                 props.windowWidth,
                 props.xOffset,
@@ -97,7 +98,6 @@ function TooltipRenderedOnPageBody(props) {
                 wrapperMeasuredHeight,
                 props.shiftHorizontal,
                 props.shiftVertical,
-                rootWrapper.current,
             ),
         [
             props.animation,
diff --git a/src/components/Tooltip/index.js b/src/components/Tooltip/index.js
index 398df07649cf..f60982f52dd4 100644
--- a/src/components/Tooltip/index.js
+++ b/src/components/Tooltip/index.js
@@ -154,6 +154,7 @@ function Tooltip(props) {
                 <Hoverable
                     onHoverIn={showTooltip}
                     onHoverOut={hideTooltip}
+                    shouldHandleScroll={props.shouldHandleScroll}
                 >
                     {children}
                 </Hoverable>
diff --git a/src/components/Tooltip/tooltipPropTypes.js b/src/components/Tooltip/tooltipPropTypes.js
index af18c4cfa412..2ddf8120d58c 100644
--- a/src/components/Tooltip/tooltipPropTypes.js
+++ b/src/components/Tooltip/tooltipPropTypes.js
@@ -28,6 +28,9 @@ const propTypes = {
 
     /** Unique key of renderTooltipContent to rerender the tooltip when one of the key changes */
     renderTooltipContentKey: PropTypes.arrayOf(PropTypes.string),
+
+    /** passes this down to Hoverable component to decide whether to handle the scroll behaviour to show hover once the scroll ends */
+    shouldHandleScroll: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -38,6 +41,7 @@ const defaultProps = {
     numberOfLines: CONST.TOOLTIP_MAX_LINES,
     renderTooltipContent: undefined,
     renderTooltipContentKey: [],
+    shouldHandleScroll: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/UnreadActionIndicator.js b/src/components/UnreadActionIndicator.js
index 5273ab52ec28..ff1090640570 100755
--- a/src/components/UnreadActionIndicator.js
+++ b/src/components/UnreadActionIndicator.js
@@ -10,6 +10,7 @@ function UnreadActionIndicator(props) {
         <View
             accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')}
             data-action-id={props.reportActionID}
+            pointerEvents="none"
             style={[styles.unreadIndicatorContainer, styles.userSelectNone]}
             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
diff --git a/src/components/UserDetailsTooltip/index.web.js b/src/components/UserDetailsTooltip/index.web.js
index 5fdae15184ac..1a78459d30a6 100644
--- a/src/components/UserDetailsTooltip/index.web.js
+++ b/src/components/UserDetailsTooltip/index.web.js
@@ -66,6 +66,7 @@ function UserDetailsTooltip(props) {
             shiftHorizontal={props.shiftHorizontal}
             renderTooltipContent={renderTooltipContent}
             renderTooltipContentKey={[userDisplayName, userLogin]}
+            shouldHandleScroll
         >
             {props.children}
         </Tooltip>
diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.js b/src/components/ValidateCode/ExpiredValidateCodeModal.js
index 449462e88130..e31e0772a8c5 100644
--- a/src/components/ValidateCode/ExpiredValidateCodeModal.js
+++ b/src/components/ValidateCode/ExpiredValidateCodeModal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -33,7 +33,7 @@ function ExpiredValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/JustSignedInModal.js b/src/components/ValidateCode/JustSignedInModal.js
index 40b25e4a19e0..e96505470eba 100644
--- a/src/components/ValidateCode/JustSignedInModal.js
+++ b/src/components/ValidateCode/JustSignedInModal.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -41,7 +41,7 @@ function JustSignedInModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index 344c3107b8cf..eabb21eea4a9 100644
--- a/src/components/ValidateCode/ValidateCodeModal.js
+++ b/src/components/ValidateCode/ValidateCodeModal.js
@@ -4,7 +4,7 @@ import {compose} from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -71,7 +71,7 @@ function ValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/WalletStatementModal/index.js b/src/components/WalletStatementModal/index.js
index cd6ce783acc1..84109217b18f 100644
--- a/src/components/WalletStatementModal/index.js
+++ b/src/components/WalletStatementModal/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
@@ -13,63 +13,55 @@ import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 import * as Report from '../../libs/actions/Report';
 
-class WalletStatementModal extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            isLoading: true,
-        };
-    }
+function WalletStatementModal({statementPageURL, session}) {
+    const [isLoading, setIsLoading] = useState(true);
+    const authToken = lodashGet(session, 'authToken', null);
 
     /**
      * Handles in-app navigation for iframe links
      *
-     * @param {MessageEvent} e
+     * @param {MessageEvent} event
      */
-    navigate(e) {
-        if (!e.data || !e.data.type || (e.data.type !== 'STATEMENT_NAVIGATE' && e.data.type !== 'CONCIERGE_NAVIGATE')) {
+    const navigate = (event) => {
+        if (!event.data || !event.data.type || (event.data.type !== 'STATEMENT_NAVIGATE' && event.data.type !== 'CONCIERGE_NAVIGATE')) {
             return;
         }
 
-        if (e.data.type === 'CONCIERGE_NAVIGATE') {
+        if (event.data.type === 'CONCIERGE_NAVIGATE') {
             Report.navigateToConciergeChat();
         }
 
-        if (e.data.type === 'STATEMENT_NAVIGATE' && e.data.url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
-            const navigateToIOURoute = _.find(iouRoutes, (iouRoute) => e.data.url.includes(iouRoute));
+        if (event.data.type === 'STATEMENT_NAVIGATE' && event.data.url) {
+            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND];
+            const navigateToIOURoute = _.find(iouRoutes, (iouRoute) => event.data.url.includes(iouRoute));
             if (navigateToIOURoute) {
                 Navigation.navigate(navigateToIOURoute);
             }
         }
-    }
+    };
 
-    render() {
-        const authToken = lodashGet(this.props, 'session.authToken', null);
-        return (
-            <>
-                {this.state.isLoading && <FullScreenLoadingIndicator />}
-                <View style={[styles.flex1]}>
-                    <iframe
-                        src={`${this.props.statementPageURL}&authToken=${authToken}`}
-                        title="Statements"
-                        height="100%"
-                        width="100%"
-                        seamless="seamless"
-                        frameBorder="0"
-                        onLoad={() => {
-                            this.setState({isLoading: false});
+    return (
+        <>
+            {isLoading && <FullScreenLoadingIndicator />}
+            <View style={[styles.flex1]}>
+                <iframe
+                    src={`${statementPageURL}&authToken=${authToken}`}
+                    title="Statements"
+                    height="100%"
+                    width="100%"
+                    seamless="seamless"
+                    frameBorder="0"
+                    onLoad={() => {
+                        setIsLoading(false);
 
-                            // We listen to a message sent from the iframe to the parent component when a link is clicked.
-                            // This lets us handle navigation in the app, outside of the iframe.
-                            window.onmessage = (e) => this.navigate(e);
-                        }}
-                    />
-                </View>
-            </>
-        );
-    }
+                        // We listen to a message sent from the iframe to the parent component when a link is clicked.
+                        // This lets us handle navigation in the app, outside of the iframe.
+                        window.onmessage = navigate;
+                    }}
+                />
+            </View>
+        </>
+    );
 }
 
 WalletStatementModal.propTypes = walletStatementPropTypes;
diff --git a/src/components/WalletStatementModal/index.native.js b/src/components/WalletStatementModal/index.native.js
index 86737da158c8..590431274da5 100644
--- a/src/components/WalletStatementModal/index.native.js
+++ b/src/components/WalletStatementModal/index.native.js
@@ -37,7 +37,7 @@ class WalletStatementModal extends React.Component {
         }
 
         if (type === 'STATEMENT_NAVIGATE' && url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
+            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND];
             const navigateToIOURoute = _.find(iouRoutes, (iouRoute) => url.includes(iouRoute));
             if (navigateToIOURoute) {
                 this.webview.stopLoading();
diff --git a/src/components/avatarPropTypes.js b/src/components/avatarPropTypes.js
index 7e978fc74963..12ee5c622b4f 100644
--- a/src/components/avatarPropTypes.js
+++ b/src/components/avatarPropTypes.js
@@ -5,5 +5,5 @@ export default PropTypes.shape({
     source: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     type: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_WORKSPACE]),
     name: PropTypes.string,
-    id: PropTypes.number,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 });
diff --git a/src/components/menuItemPropTypes.js b/src/components/menuItemPropTypes.js
index 11d85bcec187..53216ab7cdc7 100644
--- a/src/components/menuItemPropTypes.js
+++ b/src/components/menuItemPropTypes.js
@@ -88,6 +88,9 @@ const propTypes = {
     /** A right-aligned subtitle for this menu option */
     subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 
+    /** Style for the subtitle */
+    subtitleTextStyle: stylePropTypes,
+
     /** Flag to choose between avatar image or an icon */
     iconType: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_ICON, CONST.ICON_TYPE_WORKSPACE]),
 
@@ -141,6 +144,9 @@ const propTypes = {
 
     /** Should we grey out the menu item when it is disabled? */
     shouldGreyOutWhenDisabled: PropTypes.bool,
+
+    /** Should render the content in HTML format */
+    shouldRenderAsHTML: PropTypes.bool,
 };
 
 export default propTypes;
diff --git a/src/components/optionPropTypes.js b/src/components/optionPropTypes.js
index bb1a7a073b61..709298036f07 100644
--- a/src/components/optionPropTypes.js
+++ b/src/components/optionPropTypes.js
@@ -68,6 +68,4 @@ export default PropTypes.shape({
     brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']),
 
     phoneNumber: PropTypes.string,
-
-    payPalMeAddress: PropTypes.string,
 });
diff --git a/src/components/paypalMeDataPropTypes.js b/src/components/paypalMeDataPropTypes.js
deleted file mode 100644
index 5498186748a5..000000000000
--- a/src/components/paypalMeDataPropTypes.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    /** This is always 'PayPal.me' */
-    title: PropTypes.string,
-
-    /** The paypalMe address */
-    description: PropTypes.string,
-
-    /** This is always 'payPalMe' */
-    methodID: PropTypes.string,
-
-    /** This is always 'payPalMe' */
-    accountType: PropTypes.string,
-});
diff --git a/src/components/tagPropTypes.js b/src/components/tagPropTypes.js
new file mode 100644
index 000000000000..29d913dcd035
--- /dev/null
+++ b/src/components/tagPropTypes.js
@@ -0,0 +1,12 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.shape({
+    /** Name of a tag */
+    name: PropTypes.string.isRequired,
+
+    /** Flag that determines if a tag is active and able to be selected */
+    enabled: PropTypes.bool.isRequired,
+
+    /** "General Ledger code" that corresponds to this tag in an accounting system. Similar to an ID. */
+    'GL Code': PropTypes.string,
+});
diff --git a/src/components/transactionPropTypes.js b/src/components/transactionPropTypes.js
index 66ed18a1f0b7..bc0a10025ba8 100644
--- a/src/components/transactionPropTypes.js
+++ b/src/components/transactionPropTypes.js
@@ -68,7 +68,7 @@ export default PropTypes.shape({
     /** The receipt object associated with the transaction */
     receipt: PropTypes.shape({
         receiptID: PropTypes.number,
-        source: PropTypes.string,
+        source: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
         state: PropTypes.string,
     }),
 
diff --git a/src/components/withCurrentUserPersonalDetails.js b/src/components/withCurrentUserPersonalDetails.js
index 87a046e66983..7a47ea7cc712 100644
--- a/src/components/withCurrentUserPersonalDetails.js
+++ b/src/components/withCurrentUserPersonalDetails.js
@@ -36,7 +36,8 @@ export default function (WrappedComponent) {
 
     function WithCurrentUserPersonalDetails(props) {
         const accountID = props.session.accountID;
-        const currentUserPersonalDetails = useMemo(() => ({...props.personalDetails[accountID], accountID}), [props.personalDetails, accountID]);
+        const accountPersonalDetails = props.personalDetails[accountID];
+        const currentUserPersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 913d085f9428..6c588698ce9d 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -62,6 +62,13 @@ const localeProviderDefaultProps = {
 };
 
 class LocaleContextProvider extends React.Component {
+    shouldComponentUpdate(nextProps) {
+        return (
+            nextProps.preferredLocale !== this.props.preferredLocale ||
+            lodashGet(nextProps, 'currentUserPersonalDetails.timezone.selected') !== lodashGet(this.props, 'currentUserPersonalDetails.timezone.selected')
+        );
+    }
+
     /**
      * The context this component exposes to child components
      * @returns {object} translation util functions and locale
diff --git a/src/components/withNavigationFallback.js b/src/components/withNavigationFallback.js
index bc4ea5dd3fad..e82946c9e049 100644
--- a/src/components/withNavigationFallback.js
+++ b/src/components/withNavigationFallback.js
@@ -1,39 +1,30 @@
-import React, {Component} from 'react';
+import React, {forwardRef, useContext, useMemo} from 'react';
 import {NavigationContext} from '@react-navigation/core';
 import getComponentDisplayName from '../libs/getComponentDisplayName';
 import refPropTypes from './refPropTypes';
 
 export default function (WrappedComponent) {
-    class WithNavigationFallback extends Component {
-        render() {
-            if (!this.context) {
-                return (
-                    <NavigationContext.Provider
-                        value={{
-                            isFocused: () => true,
-                            addListener: () => () => {},
-                            removeListener: () => () => {},
-                        }}
-                    >
-                        <WrappedComponent
-                            // eslint-disable-next-line react/jsx-props-no-spreading
-                            {...this.props}
-                            ref={this.props.forwardedRef}
-                        />
-                    </NavigationContext.Provider>
-                );
-            }
+    function WithNavigationFallback(props) {
+        const context = useContext(NavigationContext);
 
-            return (
+        const navigationContextValue = useMemo(() => ({isFocused: () => true, addListener: () => () => {}, removeListener: () => () => {}}), []);
+
+        return context ? (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+            />
+        ) : (
+            <NavigationContext.Provider value={navigationContextValue}>
                 <WrappedComponent
                     // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...this.props}
-                    ref={this.props.forwardedRef}
+                    {...props}
+                    ref={props.forwardedRef}
                 />
-            );
-        }
+            </NavigationContext.Provider>
+        );
     }
-    WithNavigationFallback.contextType = NavigationContext;
     WithNavigationFallback.displayName = `WithNavigationFocusWithFallback(${getComponentDisplayName(WrappedComponent)})`;
     WithNavigationFallback.propTypes = {
         forwardedRef: refPropTypes,
@@ -41,7 +32,8 @@ export default function (WrappedComponent) {
     WithNavigationFallback.defaultProps = {
         forwardedRef: undefined,
     };
-    return React.forwardRef((props, ref) => (
+
+    return forwardRef((props, ref) => (
         <WithNavigationFallback
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
diff --git a/src/components/withTheme.js b/src/components/withTheme.js
new file mode 100644
index 000000000000..99de2a2c7fc7
--- /dev/null
+++ b/src/components/withTheme.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useTheme from '../styles/themes/useTheme';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemePropTypes = {
+    theme: PropTypes.object.isRequired,
+};
+
+export default function withTheme(WrappedComponent) {
+    function WithTheme(props) {
+        const theme = useTheme();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                theme={theme}
+            />
+        );
+    }
+
+    WithTheme.displayName = `withTheme(${getComponentDisplayName(WrappedComponent)})`;
+    WithTheme.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithTheme.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithTheme
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemePropTypes};
diff --git a/src/components/withThemeStyles.js b/src/components/withThemeStyles.js
new file mode 100644
index 000000000000..0320fcb71808
--- /dev/null
+++ b/src/components/withThemeStyles.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useThemeStyles from '../styles/useThemeStyles';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemeStylesPropTypes = {
+    themeStyles: PropTypes.object.isRequired,
+};
+
+export default function withThemeStyles(WrappedComponent) {
+    function WithThemeStyles(props) {
+        const themeStyles = useThemeStyles();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                themeStyles={themeStyles}
+            />
+        );
+    }
+
+    WithThemeStyles.displayName = `withThemeStyles(${getComponentDisplayName(WrappedComponent)})`;
+    WithThemeStyles.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithThemeStyles.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithThemeStyles
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemeStylesPropTypes};
diff --git a/src/components/withWindowDimensions.js b/src/components/withWindowDimensions/index.js
similarity index 95%
rename from src/components/withWindowDimensions.js
rename to src/components/withWindowDimensions/index.js
index 9ec9c5d4acbd..a3836fa99e6b 100644
--- a/src/components/withWindowDimensions.js
+++ b/src/components/withWindowDimensions/index.js
@@ -2,9 +2,9 @@ import React, {forwardRef, createContext, useState, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import {Dimensions} from 'react-native';
 import {SafeAreaInsetsContext} from 'react-native-safe-area-context';
-import getComponentDisplayName from '../libs/getComponentDisplayName';
-import variables from '../styles/variables';
-import getWindowHeightAdjustment from '../libs/getWindowHeightAdjustment';
+import getComponentDisplayName from '../../libs/getComponentDisplayName';
+import variables from '../../styles/variables';
+import getWindowHeightAdjustment from '../../libs/getWindowHeightAdjustment';
 
 const WindowDimensionsContext = createContext(null);
 const windowDimensionsPropTypes = {
diff --git a/src/components/withWindowDimensions/index.native.js b/src/components/withWindowDimensions/index.native.js
new file mode 100644
index 000000000000..e147a20c9f4e
--- /dev/null
+++ b/src/components/withWindowDimensions/index.native.js
@@ -0,0 +1,116 @@
+import React, {forwardRef, createContext, useState, useEffect} from 'react';
+import PropTypes from 'prop-types';
+import {Dimensions} from 'react-native';
+import {SafeAreaInsetsContext} from 'react-native-safe-area-context';
+import getComponentDisplayName from '../../libs/getComponentDisplayName';
+import variables from '../../styles/variables';
+import getWindowHeightAdjustment from '../../libs/getWindowHeightAdjustment';
+
+const WindowDimensionsContext = createContext(null);
+const windowDimensionsPropTypes = {
+    // Width of the window
+    windowWidth: PropTypes.number.isRequired,
+
+    // Height of the window
+    windowHeight: PropTypes.number.isRequired,
+
+    // Is the window width extra narrow, like on a Fold mobile device?
+    isExtraSmallScreenWidth: PropTypes.bool.isRequired,
+
+    // Is the window width narrow, like on a mobile device?
+    isSmallScreenWidth: PropTypes.bool.isRequired,
+
+    // Is the window width medium sized, like on a tablet device?
+    isMediumScreenWidth: PropTypes.bool.isRequired,
+
+    // Is the window width wide, like on a browser or desktop?
+    isLargeScreenWidth: PropTypes.bool.isRequired,
+};
+
+const windowDimensionsProviderPropTypes = {
+    /* Actual content wrapped by this component */
+    children: PropTypes.node.isRequired,
+};
+
+function WindowDimensionsProvider(props) {
+    const [windowDimension, setWindowDimension] = useState(() => {
+        const initialDimensions = Dimensions.get('window');
+        return {
+            windowHeight: initialDimensions.height,
+            windowWidth: initialDimensions.width,
+        };
+    });
+
+    useEffect(() => {
+        const onDimensionChange = (newDimensions) => {
+            const {window} = newDimensions;
+
+            setWindowDimension({
+                windowHeight: window.height,
+                windowWidth: window.width,
+            });
+        };
+
+        const dimensionsEventListener = Dimensions.addEventListener('change', onDimensionChange);
+
+        return () => {
+            if (!dimensionsEventListener) {
+                return;
+            }
+            dimensionsEventListener.remove();
+        };
+    }, []);
+
+    return (
+        <SafeAreaInsetsContext.Consumer>
+            {(insets) => {
+                const isExtraSmallScreenWidth = windowDimension.windowWidth <= variables.extraSmallMobileResponsiveWidthBreakpoint;
+                const isSmallScreenWidth = true;
+                const isMediumScreenWidth = false;
+                const isLargeScreenWidth = false;
+                return (
+                    <WindowDimensionsContext.Provider
+                        value={{
+                            windowHeight: windowDimension.windowHeight + getWindowHeightAdjustment(insets),
+                            windowWidth: windowDimension.windowWidth,
+                            isExtraSmallScreenWidth,
+                            isSmallScreenWidth,
+                            isMediumScreenWidth,
+                            isLargeScreenWidth,
+                        }}
+                    >
+                        {props.children}
+                    </WindowDimensionsContext.Provider>
+                );
+            }}
+        </SafeAreaInsetsContext.Consumer>
+    );
+}
+
+WindowDimensionsProvider.propTypes = windowDimensionsProviderPropTypes;
+WindowDimensionsProvider.displayName = 'WindowDimensionsProvider';
+
+/**
+ * @param {React.Component} WrappedComponent
+ * @returns {React.Component}
+ */
+export default function withWindowDimensions(WrappedComponent) {
+    const WithWindowDimensions = forwardRef((props, ref) => (
+        <WindowDimensionsContext.Consumer>
+            {(windowDimensionsProps) => (
+                <WrappedComponent
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...windowDimensionsProps}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...props}
+                    ref={ref}
+                />
+            )}
+        </WindowDimensionsContext.Consumer>
+    ));
+
+    WithWindowDimensions.displayName = `withWindowDimensions(${getComponentDisplayName(WrappedComponent)})`;
+    return WithWindowDimensions;
+}
+
+export {WindowDimensionsProvider, windowDimensionsPropTypes};
diff --git a/src/hooks/useArrowKeyFocusManager.js b/src/hooks/useArrowKeyFocusManager.js
index fdfdf07c99a7..58cecb169249 100644
--- a/src/hooks/useArrowKeyFocusManager.js
+++ b/src/hooks/useArrowKeyFocusManager.js
@@ -2,10 +2,6 @@ import {useState, useEffect, useCallback, useMemo} from 'react';
 import useKeyboardShortcut from './useKeyboardShortcut';
 import CONST from '../CONST';
 
-// Creating a default array this way because objects ({}) and arrays ([]) are not stable types.
-// The "disabledIndexes" array needs to be stable to prevent the "useCallback" hook from being recreated unnecessarily.
-// Freezing the array ensures that it cannot be unintentionally modified.
-const EMPTY_ARRAY = Object.freeze([]);
 /**
  * A hook that makes it easy to use the arrow keys to manage focus of items in a list
  *
@@ -24,7 +20,10 @@ export default function useArrowKeyFocusManager({
     maxIndex,
     onFocusedIndexChange = () => {},
     initialFocusedIndex = 0,
-    disabledIndexes = EMPTY_ARRAY,
+
+    // The "disabledIndexes" array needs to be stable to prevent the "useCallback" hook from being recreated unnecessarily.
+    // Hence the use of CONST.EMPTY_ARRAY.
+    disabledIndexes = CONST.EMPTY_ARRAY,
     shouldExcludeTextAreaNodes = true,
     isActive,
 }) {
diff --git a/src/hooks/useKeyboardShortcut.js b/src/hooks/useKeyboardShortcut.js
index 9b7244176864..b8e297c966ed 100644
--- a/src/hooks/useKeyboardShortcut.js
+++ b/src/hooks/useKeyboardShortcut.js
@@ -1,10 +1,6 @@
 import {useEffect} from 'react';
 import KeyboardShortcut from '../libs/KeyboardShortcut';
-
-// Creating a default array this way because objects ({}) and arrays ([]) are not stable types.
-// The "excludedNodes" array needs to be stable to prevent the "useEffect" hook from being recreated unnecessarily.
-// Freezing the array ensures that it cannot be unintentionally modified.
-const EMPTY_ARRAY = Object.freeze([]);
+import CONST from '../CONST';
 
 /**
  * Register a keyboard shortcut handler.
@@ -15,7 +11,17 @@ const EMPTY_ARRAY = Object.freeze([]);
  * @param {Object} [config]
  */
 export default function useKeyboardShortcut(shortcut, callback, config = {}) {
-    const {captureOnInputs = true, shouldBubble = false, priority = 0, shouldPreventDefault = true, excludedNodes = EMPTY_ARRAY, isActive = true} = config;
+    const {
+        captureOnInputs = true,
+        shouldBubble = false,
+        priority = 0,
+        shouldPreventDefault = true,
+
+        // The "excludedNodes" array needs to be stable to prevent the "useEffect" hook from being recreated unnecessarily.
+        // Hence the use of CONST.EMPTY_ARRAY.
+        excludedNodes = CONST.EMPTY_ARRAY,
+        isActive = true,
+    } = config;
 
     useEffect(() => {
         if (isActive) {
diff --git a/src/hooks/usePrivatePersonalDetails.js b/src/hooks/usePrivatePersonalDetails.js
index 37eb63dcd0fd..14c1e42e629a 100644
--- a/src/hooks/usePrivatePersonalDetails.js
+++ b/src/hooks/usePrivatePersonalDetails.js
@@ -1,4 +1,5 @@
 import {useEffect, useContext} from 'react';
+import _ from 'underscore';
 import * as PersonalDetails from '../libs/actions/PersonalDetails';
 import {NetworkContext} from '../components/OnyxProvider';
 
@@ -9,7 +10,8 @@ export default function usePrivatePersonalDetails() {
     const {isOffline} = useContext(NetworkContext);
 
     useEffect(() => {
-        if (isOffline || Boolean(PersonalDetails.getPrivatePersonalDetails())) {
+        const personalDetails = PersonalDetails.getPrivatePersonalDetails();
+        if (isOffline || (Boolean(personalDetails) && !_.isUndefined(personalDetails.isLoading))) {
             return;
         }
         PersonalDetails.openPersonalDetailsPage();
diff --git a/src/hooks/useSingleExecution.js b/src/hooks/useSingleExecution.js
index 22c2907c9420..6c28087e933c 100644
--- a/src/hooks/useSingleExecution.js
+++ b/src/hooks/useSingleExecution.js
@@ -1,5 +1,5 @@
 import {InteractionManager} from 'react-native';
-import {useCallback, useState} from 'react';
+import {useCallback, useState, useRef} from 'react';
 
 /**
  * With any action passed in, it will only allow 1 such action to occur at a time.
@@ -8,27 +8,32 @@ import {useCallback, useState} from 'react';
  */
 export default function useSingleExecution() {
     const [isExecuting, setIsExecuting] = useState(false);
+    const isExecutingRef = useRef();
 
-    const singleExecution = useCallback(
-        (action) => () => {
-            if (isExecuting) {
-                return;
-            }
-
-            setIsExecuting(true);
+    isExecutingRef.current = isExecuting;
 
-            const execution = action();
-            InteractionManager.runAfterInteractions(() => {
-                if (!(execution instanceof Promise)) {
-                    setIsExecuting(false);
+    const singleExecution = useCallback(
+        (action) =>
+            (...params) => {
+                if (isExecutingRef.current) {
                     return;
                 }
-                execution.finally(() => {
-                    setIsExecuting(false);
+
+                setIsExecuting(true);
+                isExecutingRef.current = true;
+
+                const execution = action(params);
+                InteractionManager.runAfterInteractions(() => {
+                    if (!(execution instanceof Promise)) {
+                        setIsExecuting(false);
+                        return;
+                    }
+                    execution.finally(() => {
+                        setIsExecuting(false);
+                    });
                 });
-            });
-        },
-        [isExecuting],
+            },
+        [],
     );
 
     return {isExecuting, singleExecution};
diff --git a/src/hooks/useWindowDimensions.js b/src/hooks/useWindowDimensions/index.js
similarity index 70%
rename from src/hooks/useWindowDimensions.js
rename to src/hooks/useWindowDimensions/index.js
index 58e6b8758927..1a1f7eed5a67 100644
--- a/src/hooks/useWindowDimensions.js
+++ b/src/hooks/useWindowDimensions/index.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line no-restricted-imports
-import {useWindowDimensions} from 'react-native';
-import variables from '../styles/variables';
+import {Dimensions, useWindowDimensions} from 'react-native';
+import variables from '../../styles/variables';
 
 /**
  * A convenience wrapper around React Native's useWindowDimensions hook that also provides booleans for our breakpoints.
@@ -8,7 +8,9 @@ import variables from '../styles/variables';
  */
 export default function () {
     const {width: windowWidth, height: windowHeight} = useWindowDimensions();
-    const isExtraSmallScreenHeight = windowHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
+    // When the soft keyboard opens on mWeb, the window height changes. Use static screen height instead to get real screenHeight.
+    const screenHeight = Dimensions.get('screen').height;
+    const isExtraSmallScreenHeight = screenHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
     const isSmallScreenWidth = windowWidth <= variables.mobileResponsiveWidthBreakpoint;
     const isMediumScreenWidth = windowWidth > variables.mobileResponsiveWidthBreakpoint && windowWidth <= variables.tabletResponsiveWidthBreakpoint;
     const isLargeScreenWidth = windowWidth > variables.tabletResponsiveWidthBreakpoint;
diff --git a/src/hooks/useWindowDimensions/index.native.js b/src/hooks/useWindowDimensions/index.native.js
new file mode 100644
index 000000000000..358e43f1b75d
--- /dev/null
+++ b/src/hooks/useWindowDimensions/index.native.js
@@ -0,0 +1,23 @@
+// eslint-disable-next-line no-restricted-imports
+import {useWindowDimensions} from 'react-native';
+import variables from '../../styles/variables';
+
+/**
+ * A convenience wrapper around React Native's useWindowDimensions hook that also provides booleans for our breakpoints.
+ * @returns {Object}
+ */
+export default function () {
+    const {width: windowWidth, height: windowHeight} = useWindowDimensions();
+    const isExtraSmallScreenHeight = windowHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
+    const isSmallScreenWidth = true;
+    const isMediumScreenWidth = false;
+    const isLargeScreenWidth = false;
+    return {
+        windowWidth,
+        windowHeight,
+        isExtraSmallScreenHeight,
+        isSmallScreenWidth,
+        isMediumScreenWidth,
+        isLargeScreenWidth,
+    };
+}
diff --git a/src/languages/en.js b/src/languages/en.ts
similarity index 85%
rename from src/languages/en.js
rename to src/languages/en.ts
index e36cb9539b73..416f5ff89fc2 100755
--- a/src/languages/en.js
+++ b/src/languages/en.ts
@@ -1,7 +1,88 @@
 import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import CONST from '../CONST';
+import type {
+    AddressLineParams,
+    CharacterLimitParams,
+    MaxParticipantsReachedParams,
+    ZipCodeExampleFormatParams,
+    LoggedInAsParams,
+    NewFaceEnterMagicCodeParams,
+    WelcomeEnterMagicCodeParams,
+    AlreadySignedInParams,
+    GoBackMessageParams,
+    LocalTimeParams,
+    EditActionParams,
+    DeleteActionParams,
+    DeleteConfirmationParams,
+    BeginningOfChatHistoryDomainRoomPartOneParams,
+    BeginningOfChatHistoryAdminRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartTwo,
+    WelcomeToRoomParams,
+    ReportArchiveReasonsClosedParams,
+    ReportArchiveReasonsMergedParams,
+    ReportArchiveReasonsRemovedFromPolicyParams,
+    ReportArchiveReasonsPolicyDeletedParams,
+    RequestCountParams,
+    SettleExpensifyCardParams,
+    RequestAmountParams,
+    SplitAmountParams,
+    AmountEachParams,
+    PayerOwesAmountParams,
+    PayerOwesParams,
+    PayerPaidAmountParams,
+    PayerPaidParams,
+    PayerSettledParams,
+    WaitingOnBankAccountParams,
+    SettledAfterAddedBankAccountParams,
+    PaidElsewhereWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
+    ThreadRequestReportNameParams,
+    ThreadSentMoneyReportNameParams,
+    SizeExceededParams,
+    ResolutionConstraintsParams,
+    NotAllowedExtensionParams,
+    EnterMagicCodeParams,
+    TransferParams,
+    InstantSummaryParams,
+    NotYouParams,
+    DateShouldBeBeforeParams,
+    DateShouldBeAfterParams,
+    IncorrectZipFormatParams,
+    WeSentYouMagicSignInLinkParams,
+    ToValidateLoginParams,
+    NoLongerHaveAccessParams,
+    OurEmailProviderParams,
+    ConfirmThatParams,
+    UntilTimeParams,
+    StepCounterParams,
+    UserIsAlreadyMemberOfWorkspaceParams,
+    GoToRoomParams,
+    WelcomeNoteParams,
+    RoomNameReservedErrorParams,
+    RenamedRoomActionParams,
+    RoomRenamedToParams,
+    OOOEventSummaryFullDayParams,
+    OOOEventSummaryPartialDayParams,
+    ParentNavigationSummaryParams,
+    ManagerApprovedParams,
+    SetTheRequestParams,
+    UpdatedTheRequestParams,
+    RemovedTheRequestParams,
+    TagSelectionParams,
+    TranslationBase,
+} from './types';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 
+type StateValue = {
+    stateISO: string;
+    stateName: string;
+};
+
+type States = Record<keyof typeof COMMON_CONST.STATES, StateValue>;
+
+type AllCountries = Record<keyof typeof CONST.ALL_COUNTRIES, string>;
+
 /* eslint-disable max-len */
 export default {
     common: {
@@ -73,7 +154,7 @@ export default {
         currentMonth: 'Current month',
         ssnLast4: 'Last 4 digits of SSN',
         ssnFull9: 'Full 9 digits of SSN',
-        addressLine: ({lineNumber}) => `Address line ${lineNumber}`,
+        addressLine: ({lineNumber}: AddressLineParams) => `Address line ${lineNumber}`,
         personalAddress: 'Personal address',
         companyAddress: 'Company address',
         noPO: 'PO boxes and mail drop addresses are not allowed',
@@ -104,9 +185,12 @@ export default {
             acceptTerms: 'You must accept the Terms of Service to continue',
             phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'This field is required.',
-            characterLimit: ({limit}) => `Exceeds the maximum length of ${limit} characters`,
+            characterLimit: ({limit}: CharacterLimitParams) => `Exceeds the maximum length of ${limit} characters`,
             dateInvalid: 'Please select a valid date',
             invalidCharacter: 'Invalid character',
+            enterMerchant: 'Enter a merchant name',
+            enterAmount: 'Enter an amount',
+            enterDate: 'Enter a date',
         },
         comma: 'comma',
         semicolon: 'semicolon',
@@ -120,7 +204,6 @@ export default {
         done: 'Done',
         more: 'More',
         debitCard: 'Debit card',
-        payPalMe: 'PayPal.me',
         bankAccount: 'Bank account',
         join: 'Join',
         decline: 'Decline',
@@ -134,14 +217,14 @@ export default {
         youAfterPreposition: 'you',
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
-        maxParticipantsReached: ({count}) => `You've selected the maximum number (${count}) of participants.`,
+        maxParticipantsReached: ({count}: MaxParticipantsReachedParams) => `You've selected the maximum number (${count}) of participants.`,
         youAppearToBeOffline: 'You appear to be offline.',
         thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
         areYouSure: 'Are you sure?',
         verify: 'Verify',
         yesContinue: 'Yes, continue',
         websiteExample: 'e.g. https://www.expensify.com',
-        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({zipSampleFormat}: ZipCodeExampleFormatParams) => (zipSampleFormat ? `e.g. ${zipSampleFormat}` : ''),
         description: 'Description',
         with: 'with',
         shareCode: 'Share code',
@@ -158,9 +241,18 @@ export default {
         showMore: 'Show more',
         merchant: 'Merchant',
         category: 'Category',
+        billable: 'Billable',
+        tag: 'Tag',
         receipt: 'Receipt',
         replace: 'Replace',
         distance: 'Distance',
+        mile: 'mile',
+        miles: 'miles',
+        kilometer: 'kilometer',
+        kilometers: 'kilometers',
+        recent: 'Recent',
+        all: 'All',
+        tbd: 'TBD',
     },
     anonymousReportFooter: {
         logoTagline: 'Join the discussion.',
@@ -201,7 +293,7 @@ export default {
         redirectedToDesktopApp: "We've redirected you to the desktop app.",
         youCanAlso: 'You can also',
         openLinkInBrowser: 'open this link in your browser',
-        loggedInAs: ({email}) => `You're logged in as ${email}. Click "Open link" in the prompt to log into the desktop app with this account.`,
+        loggedInAs: ({email}: LoggedInAsParams) => `You're logged in as ${email}. Click "Open link" in the prompt to log into the desktop app with this account.`,
         doNotSeePrompt: "Can't see the prompt?",
         tryAgain: 'Try again',
         or: ', or',
@@ -247,13 +339,9 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        newFaceEnterMagicCode: ({login}) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
-        welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
-    },
-    DownloadAppModal: {
-        downloadTheApp: 'Download the app',
-        keepTheConversationGoing: 'Keep the conversation going in New Expensify, download the app for an enhanced experience.',
-        noThanks: 'No thanks',
+        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
+            `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
         hero: {
@@ -262,8 +350,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({email}) => `You are already signed in as ${email}.`,
-        goBackMessage: ({provider}) => `Don't want to sign in with ${provider}?`,
+        alreadySignedIn: ({email}: AlreadySignedInParams) => `You are already signed in as ${email}.`,
+        goBackMessage: ({provider}: GoBackMessageParams) => `Don't want to sign in with ${provider}?`,
         continueWithMyCurrentSession: 'Continue with my current session',
         redirectToDesktopMessage: "We'll redirect you to the desktop app once you finish signing in.",
         signInAgreementMessage: 'By logging in, you agree to the',
@@ -288,7 +376,7 @@ export default {
         ],
         blockedFromConcierge: 'Communication is barred',
         fileUploadFailed: 'Upload failed. File is not supported.',
-        localTime: ({user, time}) => `It's ${time} for ${user}`,
+        localTime: ({user, time}: LocalTimeParams) => `It's ${time} for ${user}`,
         edited: '(edited)',
         emoji: 'Emoji',
         collapse: 'Collapse',
@@ -302,9 +390,9 @@ export default {
         copyEmailToClipboard: 'Copy email to clipboard',
         markAsUnread: 'Mark as unread',
         markAsRead: 'Mark as read',
-        editAction: ({action}) => `Edit ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
-        deleteAction: ({action}) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
-        deleteConfirmation: ({action}) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
+        editAction: ({action}: EditActionParams) => `Edit ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
+        deleteAction: ({action}: DeleteActionParams) => `Delete ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}`,
+        deleteConfirmation: ({action}: DeleteConfirmationParams) => `Are you sure you want to delete this ${ReportActionsUtils.isMoneyRequestAction(action) ? 'request' : 'comment'}?`,
         onlyVisible: 'Only visible to',
         replyInThread: 'Reply in thread',
         flagAsOffensive: 'Flag as offensive',
@@ -316,13 +404,14 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'You missed the party in ',
         beginningOfArchivedRoomPartTwo: ", there's nothing to see here.",
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
         beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.',
-        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
+        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
         beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.',
         beginningOfChatHistoryAdminOnlyPostingRoom: 'Only admins can send messages in this room.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` to chat about anything ${workspaceName} related.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
+            `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` to chat about anything ${workspaceName} related.`,
         beginningOfChatHistoryUserRoomPartOne: 'Collaboration starts here! 🎉\nUse this space to chat about anything ',
         beginningOfChatHistoryUserRoomPartTwo: ' related.',
         beginningOfChatHistory: 'This is the beginning of your chat with ',
@@ -331,7 +420,7 @@ export default {
         beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, request money and settle up.',
         chatWithAccountManager: 'Chat with your account manager here',
         sayHello: 'Say hello!',
-        welcomeToRoom: ({roomName}) => `Welcome to ${roomName}!`,
+        welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
         usePlusButton: '\n\nYou can also use the + button below to request money or assign a task!',
     },
     reportAction: {
@@ -348,12 +437,14 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'This chat room has been archived.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `This workspace chat is no longer active because ${displayName} closed their account.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}: ReportArchiveReasonsClosedParams) =>
+            `This workspace chat is no longer active because ${displayName} closed their account.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}: ReportArchiveReasonsMergedParams) =>
             `This workspace chat is no longer active because ${oldDisplayName} has merged their account with ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}: ReportArchiveReasonsRemovedFromPolicyParams) =>
             `This workspace chat is no longer active because ${displayName} is no longer a member of the ${policyName} workspace.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}: ReportArchiveReasonsPolicyDeletedParams) =>
+            `This workspace chat is no longer active because ${policyName} is no longer an active workspace.`,
     },
     writeCapabilityPage: {
         label: 'Who can post',
@@ -363,13 +454,10 @@ export default {
         },
     },
     sidebarScreen: {
-        fabAction: 'New chat',
-        newChat: 'New chat',
-        newGroup: 'New group',
-        newRoom: 'New room',
         buttonSearch: 'Search',
         buttonMySettings: 'My settings',
-        fabNewChat: 'New chat (Floating action)',
+        fabNewChat: 'Send message',
+        fabNewChatExplained: 'Send message (Floating action)',
         chatPinned: 'Chat pinned',
         draftedMessage: 'Drafted message',
         listOfChatMessages: 'List of chat messages',
@@ -377,6 +465,8 @@ export default {
         saveTheWorld: 'Save the world',
     },
     tabSelector: {
+        chat: 'Chat',
+        room: 'Room',
         manual: 'Manual',
         scan: 'Scan',
     },
@@ -403,9 +493,10 @@ export default {
         approved: 'Approved',
         cash: 'Cash',
         split: 'Split',
+        addToSplit: 'Add to split',
+        splitBill: 'Split bill',
         request: 'Request',
         participants: 'Participants',
-        splitBill: 'Split bill',
         requestMoney: 'Request money',
         sendMoney: 'Send money',
         pay: 'Pay',
@@ -413,41 +504,47 @@ export default {
         pending: 'Pending',
         deleteReceipt: 'Delete receipt',
         receiptScanning: 'Receipt scan in progress…',
+        receiptMissingDetails: 'Receipt missing details',
         receiptStatusTitle: 'Scanning…',
         receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
-        requestCount: ({count, scanningReceipts = 0}) => `${count} requests${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}`,
+        requestCount: ({count, scanningReceipts = 0}: RequestCountParams) => `${count} requests${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}`,
         deleteRequest: 'Delete request',
         deleteConfirmation: 'Are you sure that you want to delete this request?',
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
-        settledPaypalMe: 'Paid using Paypal.me',
-        settleExpensify: ({formattedAmount}) => `Pay ${formattedAmount} with Expensify`,
+        settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => `Pay ${formattedAmount} with Expensify`,
         payElsewhere: 'Pay elsewhere',
-        settlePaypalMe: ({formattedAmount}) => `Pay ${formattedAmount} with PayPal.me`,
-        requestAmount: ({amount}) => `request ${amount}`,
-        splitAmount: ({amount}) => `split ${amount}`,
-        amountEach: ({amount}) => `${amount} each`,
-        payerOwesAmount: ({payer, amount}) => `${payer} owes ${amount}`,
-        payerOwes: ({payer}) => `${payer} owes: `,
-        payerPaidAmount: ({payer, amount}) => `${payer} paid ${amount}`,
-        payerPaid: ({payer}) => `${payer} paid: `,
-        managerApproved: ({manager}) => `${manager} approved:`,
-        payerSettled: ({amount}) => `paid ${amount}`,
-        waitingOnBankAccount: ({submitterDisplayName}) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`,
-        settledAfterAddedBankAccount: ({submitterDisplayName, amount}) => `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`,
-        paidElsewhereWithAmount: ({amount}) => `paid ${amount} elsewhere`,
-        paidUsingPaypalWithAmount: ({amount}) => `paid ${amount} using Paypal.me`,
-        paidUsingExpensifyWithAmount: ({amount}) => `paid ${amount} using Expensify`,
+        requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`,
+        splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
+        amountEach: ({amount}: AmountEachParams) => `${amount} each`,
+        payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} owes ${amount}`,
+        payerOwes: ({payer}: PayerOwesParams) => `${payer} owes: `,
+        payerPaidAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer} paid ${amount}`,
+        payerPaid: ({payer}: PayerPaidParams) => `${payer} paid: `,
+        managerApproved: ({manager}: ManagerApprovedParams) => `${manager} approved:`,
+        payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`,
+        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`,
+        settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
+            `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`,
+        paidElsewhereWithAmount: ({amount}: PaidElsewhereWithAmountParams) => `paid ${amount} elsewhere`,
+        paidWithExpensifyWithAmount: ({amount}: PaidWithExpensifyWithAmountParams) => `paid ${amount} with Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
-        threadRequestReportName: ({formattedAmount, comment}) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        changedTheRequest: 'changed the request',
+        setTheRequest: ({valueName, newValueToDisplay}: SetTheRequestParams) => `set the ${valueName} to ${newValueToDisplay}`,
+        removedTheRequest: ({valueName, oldValueToDisplay}: RemovedTheRequestParams) => `removed the ${valueName} (previously ${oldValueToDisplay})`,
+        updatedTheRequest: ({valueName, newValueToDisplay, oldValueToDisplay}: UpdatedTheRequestParams) =>
+            `changed the ${valueName} to ${newValueToDisplay} (previously ${oldValueToDisplay})`,
+        threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
+        threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        tagSelection: ({tagName}: TagSelectionParams) => `Select a ${tagName} to add additional organization to your money`,
         error: {
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
             genericCreateFailureMessage: 'Unexpected error requesting money, please try again later',
             genericDeleteFailureMessage: 'Unexpected error deleting the money request, please try again later',
             genericEditFailureMessage: 'Unexpected error editing the money request, please try again later',
+            genericSmartscanFailureMessage: 'Transaction is missing fields',
         },
     },
     notificationPreferencesPage: {
@@ -467,11 +564,13 @@ export default {
         uploadPhoto: 'Upload photo',
         removePhoto: 'Remove photo',
         editImage: 'Edit photo',
+        viewPhoto: 'View photo',
+        imageUploadFailed: 'Image upload failed',
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
-        sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
+        sizeExceeded: ({maxUploadSizeInMB}: SizeExceededParams) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}: ResolutionConstraintsParams) =>
             `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels and smaller than ${maxHeightInPx}x${maxWidthInPx} pixels.`,
-        notAllowedExtension: ({allowedExtensions}) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({allowedExtensions}: NotAllowedExtensionParams) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Profile',
@@ -486,6 +585,7 @@ export default {
         online: 'Online',
         offline: 'Offline',
         syncing: 'Syncing',
+        profileAvatar: 'Profile avatar',
     },
     loungeAccessPage: {
         loungeAccess: 'Lounge access',
@@ -507,7 +607,7 @@ export default {
         helpTextAfterEmail: ' from multiple email addresses.',
         pleaseVerify: 'Please verify this contact method',
         getInTouch: "Whenever we need to get in touch with you, we'll use this contact method.",
-        enterMagicCode: ({contactMethod}) => `Please enter the magic code sent to ${contactMethod}`,
+        enterMagicCode: ({contactMethod}: EnterMagicCodeParams) => `Please enter the magic code sent to ${contactMethod}`,
         setAsDefault: 'Set as default',
         yourDefaultContactMethod:
             'This is your current default contact method. You will not be able to delete this contact method until you set an alternative default by selecting another contact method and pressing “Set as default”.',
@@ -526,6 +626,7 @@ export default {
             invalidContactMethod: 'Invalid contact method',
         },
         newContactMethod: 'New contact method',
+        goBackContactMethods: 'Go back to contact methods',
     },
     pronouns: {
         coCos: 'Co / Cos',
@@ -647,17 +748,12 @@ export default {
         passwordUpdated: 'Password updated!',
         allSet: 'You’re all set. Keep your new password safe.',
     },
-    addPayPalMePage: {
-        enterYourUsernameToGetPaidViaPayPal: 'Get paid back via PayPal.',
-        payPalMe: 'PayPal.me/',
-        yourPayPalUsername: 'Your PayPal username',
-        addPayPalAccount: 'Add PayPal account',
-        growlMessageOnSave: 'Your PayPal username was successfully added',
-        updatePaypalAccount: 'Save PayPal account',
-        growlMessageOnUpdate: 'Your PayPal username was successfully saved',
-        formatError: 'Invalid PayPal.me username',
-        checkListOf: 'Check the list of ',
-        supportedCurrencies: 'supported currencies',
+    privateNotes: {
+        title: 'Private notes',
+        personalNoteMessage: 'Keep notes about this chat here. You are the only person who can add, edit or view these notes.',
+        sharedNoteMessage: 'Keep notes about this chat here. Expensify employees and other users on the team.expensify.com domain can view these notes.',
+        notesUnavailable: 'No notes found for the user',
+        composerLabel: 'Notes',
     },
     addDebitCardPage: {
         addADebitCard: 'Add a debit card',
@@ -688,7 +784,6 @@ export default {
         setDefaultSuccess: 'Default payment method set!',
         deleteAccount: 'Delete account',
         deleteConfirmation: 'Are you sure that you want to delete this account?',
-        deletePayPalSuccess: 'PayPal.me successfully deleted',
         error: {
             notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
             invalidBankAccount: 'This bank account is temporarily suspended.',
@@ -698,9 +793,9 @@ export default {
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
     },
     transferAmountPage: {
-        transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`,
+        transfer: ({amount}: TransferParams) => `Transfer${amount ? ` ${amount}` : ''}`,
         instant: 'Instant (Debit card)',
-        instantSummary: ({rate, minAmount}) => `${rate}% fee (${minAmount} minimum)`,
+        instantSummary: ({rate, minAmount}: InstantSummaryParams) => `${rate}% fee (${minAmount} minimum)`,
         ach: '1-3 Business days (Bank account)',
         achSummary: 'No fee',
         whichAccount: 'Which account?',
@@ -831,7 +926,7 @@ export default {
         },
         cannotGetAccountDetails: "Couldn't retrieve account details, please try to sign in again.",
         loginForm: 'Login form',
-        notYou: ({user}) => `Not ${user}?`,
+        notYou: ({user}: NotYouParams) => `Not ${user}?`,
     },
     personalDetails: {
         error: {
@@ -847,27 +942,29 @@ export default {
         legalLastName: 'Legal last name',
         homeAddress: 'Home address',
         error: {
-            dateShouldBeBefore: ({dateString}) => `Date should be before ${dateString}.`,
-            dateShouldBeAfter: ({dateString}) => `Date should be after ${dateString}.`,
+            dateShouldBeBefore: ({dateString}: DateShouldBeBeforeParams) => `Date should be before ${dateString}.`,
+            dateShouldBeAfter: ({dateString}: DateShouldBeAfterParams) => `Date should be after ${dateString}.`,
             hasInvalidCharacter: 'Name can only include letters.',
-            incorrectZipFormat: ({zipFormat}) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
+            incorrectZipFormat: ({zipFormat}: IncorrectZipFormatParams) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        weSentYouMagicSignInLink: ({login, loginType}) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
+        weSentYouMagicSignInLink: ({login, loginType}: WeSentYouMagicSignInLinkParams) => `I've sent a magic sign-in link to ${login}. Please check your ${loginType} to sign in.`,
         resendLink: 'Resend link',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({primaryLogin, secondaryLogin}) => `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
-        noLongerHaveAccess: ({primaryLogin}) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
+        toValidateLogin: ({primaryLogin, secondaryLogin}: ToValidateLoginParams) =>
+            `To validate ${secondaryLogin}, please resend the magic code from the Account Settings of ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}: NoLongerHaveAccessParams) => `If you no longer have access to ${primaryLogin}, please unlink your accounts.`,
         unlink: 'Unlink',
         linkSent: 'Link sent!',
         succesfullyUnlinkedLogin: 'Secondary login successfully unlinked!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({login}) => `Our email provider has temporarily suspended emails to ${login} due to delivery issues. To unblock your login, please follow these steps:`,
-        confirmThat: ({login}) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
+        ourEmailProvider: (user: OurEmailProviderParams) =>
+            `Our email provider has temporarily suspended emails to ${user.login} due to delivery issues. To unblock your login, please follow these steps:`,
+        confirmThat: ({login}: ConfirmThatParams) => `Confirm that ${login} is spelled correctly and is a real, deliverable email address. `,
         emailAliases: 'Email aliases such as "expenses@domain.com" must have access to their own email inbox for it to be a valid Expensify login.',
         ensureYourEmailClient: 'Ensure your email client allows expensify.com emails. ',
         youCanFindDirections: 'You can find directions on how to complete this step ',
@@ -879,7 +976,9 @@ export default {
         localTime: 'Local time',
     },
     newChatPage: {
+        createChat: 'Create chat',
         createGroup: 'Create group',
+        addToGroup: 'Add to group',
     },
     yearPickerPage: {
         year: 'Year',
@@ -892,7 +991,7 @@ export default {
         notHere: "Hmm... it's not here",
         pageNotFound: 'Oops, this page cannot be found',
         noAccess: "You don't have access to this chat",
-        goBackHome: 'Go back to Home page',
+        goBackHome: 'Go back to home page',
     },
     setPasswordPage: {
         enterPassword: 'Enter a password',
@@ -912,9 +1011,9 @@ export default {
         save: 'Save',
         message: 'Message',
         untilTomorrow: 'Until tomorrow',
-        untilTime: ({time}) => `Until ${time}`,
+        untilTime: ({time}: UntilTimeParams) => `Until ${time}`,
     },
-    stepCounter: ({step, total, text}) => {
+    stepCounter: ({step, total, text}: StepCounterParams) => {
         let result = `Step ${step}`;
 
         if (total) {
@@ -997,7 +1096,7 @@ export default {
     messages: {
         errorMessageInvalidPhone: `Please enter a valid phone number without brackets or dashes. If you're outside the US please include your country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
         errorMessageInvalidEmail: 'Invalid email',
-        userIsAlreadyMemberOfWorkspace: ({login, workspace}) => `${login} is already a member of ${workspace}`,
+        userIsAlreadyMemberOfWorkspace: ({login, workspace}: UserIsAlreadyMemberOfWorkspaceParams) => `${login} is already a member of ${workspace}`,
     },
     onfidoStep: {
         acceptTerms: 'By continuing with the request to activate your Expensify wallet, you confirm that you have read, understand and accept ',
@@ -1202,7 +1301,8 @@ export default {
             unavailable: 'Unavailable workspace',
             memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
             notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({roomName}) => `Go to ${roomName} room`,
+            goToRoom: ({roomName}: GoToRoomParams) => `Go to ${roomName} room`,
+            workspaceAvatar: 'Workspace avatar',
         },
         emptyWorkspace: {
             title: 'Create a new workspace',
@@ -1245,7 +1345,6 @@ export default {
             captureReceipts: 'Capture receipts',
             fastReimbursementsHappyMembers: 'Fast reimbursements = happy members!',
             kilometers: 'Kilometers',
-            miles: 'Miles',
             viewAllReceipts: 'View all receipts',
             reimburseReceipts: 'Reimburse receipts',
             trackDistance: 'Track distance',
@@ -1259,6 +1358,7 @@ export default {
             fastReimbursementsVBACopy: "You're all set to reimburse receipts from your bank account!",
             updateCustomUnitError: "Your changes couldn't be saved. The workspace was modified while you were offline, please try again.",
             invalidRateError: 'Please enter a valid rate',
+            lowRateError: 'Rate must be greater than 0',
         },
         bills: {
             manageYourBills: 'Manage your bills',
@@ -1299,7 +1399,7 @@ 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}) =>
+            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.`,
         },
         editor: {
@@ -1372,15 +1472,16 @@ export default {
         restrictedDescription: 'People in your workspace can find this room',
         privateDescription: 'People invited to this room can find it',
         publicDescription: 'Anyone can find this room',
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         public_announceDescription: 'Anyone can find this room',
         createRoom: 'Create room',
         roomAlreadyExistsError: 'A room with this name already exists',
-        roomNameReservedError: ({reservedName}) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
+        roomNameReservedError: ({reservedName}: RoomNameReservedErrorParams) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
         roomNameInvalidError: 'Room names can only include lowercase letters, numbers and hyphens',
         pleaseEnterRoomName: 'Please enter a room name',
         pleaseSelectWorkspace: 'Please select a workspace',
-        renamedRoomAction: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
-        roomRenamedTo: ({newName}) => `Room renamed to ${newName}`,
+        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => ` renamed this room from ${oldName} to ${newName}`,
+        roomRenamedTo: ({newName}: RoomRenamedToParams) => `Room renamed to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
         growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
@@ -1388,6 +1489,7 @@ export default {
             restricted: 'Restricted',
             private: 'Private',
             public: 'Public',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             public_announce: 'Public Announce',
         },
     },
@@ -1409,7 +1511,7 @@ export default {
         completed: 'Completed',
         messages: {
             completed: 'completed task',
-            canceled: 'canceled task',
+            canceled: 'deleted task',
             reopened: 'reopened task',
             error: 'You do not have the permission to do the requested action.',
         },
@@ -1427,7 +1529,7 @@ export default {
             openShortcutDialog: 'Opens the keyboard shortcuts dialog',
             escape: 'Escape dialogs',
             search: 'Open search dialog',
-            newGroup: 'New group screen',
+            newChat: 'New chat screen',
             copy: 'Copy comment',
         },
     },
@@ -1531,8 +1633,8 @@ export default {
         noActivityYet: 'No activity yet',
     },
     chronos: {
-        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
-        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} from ${timePeriod} on ${date}`,
+        oooEventSummaryFullDay: ({summary, dayCount, date}: OOOEventSummaryFullDayParams) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
+        oooEventSummaryPartialDay: ({summary, timePeriod, date}: OOOEventSummaryPartialDayParams) => `${summary} from ${timePeriod} on ${date}`,
     },
     footer: {
         features: 'Features',
@@ -1563,8 +1665,8 @@ export default {
         createAccount: 'Create A New Account',
         logIn: 'Log In',
     },
-    allStates: COMMON_CONST.STATES,
-    allCountries: CONST.ALL_COUNTRIES,
+    allStates: COMMON_CONST.STATES as States,
+    allCountries: CONST.ALL_COUNTRIES as AllCountries,
     accessibilityHints: {
         navigateToChatsList: 'Navigate back to chats list',
         chatWelcomeMessage: 'Chat welcome message',
@@ -1581,6 +1683,7 @@ export default {
     parentReportAction: {
         deletedMessage: '[Deleted message]',
         deletedRequest: '[Deleted request]',
+        deletedTask: '[Deleted task]',
         hiddenMessage: '[Hidden message]',
     },
     threads: {
@@ -1588,7 +1691,7 @@ export default {
         reply: 'Reply',
         from: 'From',
         in: 'In',
-        parentNavigationSummary: ({rootReportName, workspaceName}) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({rootReportName, workspaceName}: ParentNavigationSummaryParams) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copy URL to clipboard',
@@ -1658,18 +1761,4 @@ export default {
             selectSuggestedAddress: 'Please select a suggested address',
         },
     },
-    countrySelectorModal: {
-        placeholderText: 'Search to see options',
-    },
-    stateSelectorModal: {
-        placeholderText: 'Search to see options',
-    },
-    demos: {
-        saastr: {
-            signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
-        },
-        sbe: {
-            signInWelcome: 'Welcome to Small Business Expo! Get paid back for your ride.',
-        },
-    },
-};
+} satisfies TranslationBase;
diff --git a/src/languages/es-ES.js b/src/languages/es-ES.ts
similarity index 100%
rename from src/languages/es-ES.js
rename to src/languages/es-ES.ts
diff --git a/src/languages/es.js b/src/languages/es.ts
similarity index 88%
rename from src/languages/es.js
rename to src/languages/es.ts
index aee7351f0067..2606bfb7af1a 100644
--- a/src/languages/es.js
+++ b/src/languages/es.ts
@@ -1,5 +1,77 @@
 import CONST from '../CONST';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
+import type {
+    AddressLineParams,
+    CharacterLimitParams,
+    MaxParticipantsReachedParams,
+    ZipCodeExampleFormatParams,
+    LoggedInAsParams,
+    NewFaceEnterMagicCodeParams,
+    WelcomeEnterMagicCodeParams,
+    AlreadySignedInParams,
+    GoBackMessageParams,
+    LocalTimeParams,
+    EditActionParams,
+    DeleteActionParams,
+    DeleteConfirmationParams,
+    BeginningOfChatHistoryDomainRoomPartOneParams,
+    BeginningOfChatHistoryAdminRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartTwo,
+    WelcomeToRoomParams,
+    ReportArchiveReasonsClosedParams,
+    ReportArchiveReasonsMergedParams,
+    ReportArchiveReasonsRemovedFromPolicyParams,
+    ReportArchiveReasonsPolicyDeletedParams,
+    RequestCountParams,
+    SettleExpensifyCardParams,
+    RequestAmountParams,
+    SplitAmountParams,
+    AmountEachParams,
+    PayerOwesAmountParams,
+    PayerOwesParams,
+    PayerPaidAmountParams,
+    PayerPaidParams,
+    PayerSettledParams,
+    WaitingOnBankAccountParams,
+    SettledAfterAddedBankAccountParams,
+    PaidElsewhereWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
+    ThreadRequestReportNameParams,
+    ThreadSentMoneyReportNameParams,
+    SizeExceededParams,
+    ResolutionConstraintsParams,
+    NotAllowedExtensionParams,
+    EnterMagicCodeParams,
+    TransferParams,
+    InstantSummaryParams,
+    NotYouParams,
+    DateShouldBeBeforeParams,
+    DateShouldBeAfterParams,
+    IncorrectZipFormatParams,
+    WeSentYouMagicSignInLinkParams,
+    ToValidateLoginParams,
+    NoLongerHaveAccessParams,
+    OurEmailProviderParams,
+    ConfirmThatParams,
+    UntilTimeParams,
+    StepCounterParams,
+    UserIsAlreadyMemberOfWorkspaceParams,
+    GoToRoomParams,
+    WelcomeNoteParams,
+    RoomNameReservedErrorParams,
+    RenamedRoomActionParams,
+    RoomRenamedToParams,
+    OOOEventSummaryFullDayParams,
+    OOOEventSummaryPartialDayParams,
+    ParentNavigationSummaryParams,
+    ManagerApprovedParams,
+    SetTheRequestParams,
+    UpdatedTheRequestParams,
+    RemovedTheRequestParams,
+    TagSelectionParams,
+    EnglishTranslation,
+} from './types';
 
 /* eslint-disable max-len */
 export default {
@@ -72,7 +144,7 @@ export default {
         currentMonth: 'Mes actual',
         ssnLast4: 'Últimos 4 dígitos de su SSN',
         ssnFull9: 'Los 9 dígitos del SSN',
-        addressLine: ({lineNumber}) => `Dirección línea ${lineNumber}`,
+        addressLine: ({lineNumber}: AddressLineParams) => `Dirección línea ${lineNumber}`,
         personalAddress: 'Dirección física personal',
         companyAddress: 'Dirección física de la empresa',
         noPO: 'No se aceptan apartados ni direcciones postales',
@@ -103,9 +175,12 @@ export default {
             acceptTerms: 'Debes aceptar los Términos de Servicio para continuar',
             phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`,
             fieldRequired: 'Este campo es obligatorio.',
-            characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`,
+            characterLimit: ({limit}: CharacterLimitParams) => `Supera el límite de ${limit} caracteres`,
             dateInvalid: 'Por favor, selecciona una fecha válida',
             invalidCharacter: 'Carácter invalido',
+            enterMerchant: 'Introduce un comerciante',
+            enterAmount: 'Introduce un importe',
+            enterDate: 'Introduce una fecha',
         },
         comma: 'la coma',
         semicolon: 'el punto y coma',
@@ -119,7 +194,6 @@ export default {
         done: 'Listo',
         more: 'Más',
         debitCard: 'Tarjeta de débito',
-        payPalMe: 'PayPal.me',
         bankAccount: 'Cuenta bancaria',
         join: 'Unirse',
         decline: 'Rechazar',
@@ -133,14 +207,14 @@ export default {
         youAfterPreposition: 'ti',
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
-        maxParticipantsReached: ({count}) => `Has seleccionado el número máximo (${count}) de participantes.`,
+        maxParticipantsReached: ({count}: MaxParticipantsReachedParams) => `Has seleccionado el número máximo (${count}) de participantes.`,
         youAppearToBeOffline: 'Parece que estás desconectado.',
         thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
         areYouSure: '¿Estás seguro?',
         verify: 'Verifique',
         yesContinue: 'Sí, continuar',
         websiteExample: 'p. ej. https://www.expensify.com',
-        zipCodeExampleFormat: ({zipSampleFormat}) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
+        zipCodeExampleFormat: ({zipSampleFormat}: ZipCodeExampleFormatParams) => (zipSampleFormat ? `p. ej. ${zipSampleFormat}` : ''),
         description: 'Descripción',
         with: 'con',
         shareCode: 'Compartir código',
@@ -157,9 +231,18 @@ export default {
         showMore: 'Mostrar más',
         merchant: 'Comerciante',
         category: 'Categoría',
+        billable: 'Facturable',
+        tag: 'Etiqueta',
         receipt: 'Recibo',
         replace: 'Sustituir',
         distance: 'Distancia',
+        mile: 'milla',
+        miles: 'millas',
+        kilometer: 'kilómetro',
+        kilometers: 'kilómetros',
+        recent: 'Reciente',
+        all: 'Todo',
+        tbd: 'Por determinar',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discusión.',
@@ -200,7 +283,8 @@ export default {
         redirectedToDesktopApp: 'Te hemos redirigido a la aplicación de escritorio.',
         youCanAlso: 'También puedes',
         openLinkInBrowser: 'abrir este enlace en tu navegador',
-        loggedInAs: ({email}) => `Has iniciado sesión como ${email}. Haga clic en "Abrir enlace" en el aviso para iniciar sesión en la aplicación de escritorio con esta cuenta.`,
+        loggedInAs: ({email}: LoggedInAsParams) =>
+            `Has iniciado sesión como ${email}. Haga clic en "Abrir enlace" en el aviso para iniciar sesión en la aplicación de escritorio con esta cuenta.`,
         doNotSeePrompt: '¿No ves el aviso?',
         tryAgain: 'Inténtalo de nuevo',
         or: ', o',
@@ -246,13 +330,9 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        newFaceEnterMagicCode: ({login}) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
-        welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
-    },
-    DownloadAppModal: {
-        downloadTheApp: 'Descarga la aplicación',
-        keepTheConversationGoing: 'Mantén la conversación en New Expensify, descarga la aplicación para una experiencia mejorada.',
-        noThanks: 'No, gracias',
+        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
+            `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
         hero: {
@@ -261,8 +341,8 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({email}) => `Ya has iniciado sesión con ${email}.`,
-        goBackMessage: ({provider}) => `No quieres iniciar sesión con ${provider}?`,
+        alreadySignedIn: ({email}: AlreadySignedInParams) => `Ya has iniciado sesión con ${email}.`,
+        goBackMessage: ({provider}: GoBackMessageParams) => `No quieres iniciar sesión con ${provider}?`,
         continueWithMyCurrentSession: 'Continuar con mi sesión actual',
         redirectToDesktopMessage: 'Lo redirigiremos a la aplicación de escritorio una vez que termine de iniciar sesión.',
         signInAgreementMessage: 'Al iniciar sesión, aceptas las',
@@ -287,7 +367,7 @@ export default {
         ],
         blockedFromConcierge: 'Comunicación no permitida',
         fileUploadFailed: 'Subida fallida. El archivo no es compatible.',
-        localTime: ({user, time}) => `Son las ${time} para ${user}`,
+        localTime: ({user, time}: LocalTimeParams) => `Son las ${time} para ${user}`,
         edited: '(editado)',
         emoji: 'Emoji',
         collapse: 'Colapsar',
@@ -301,9 +381,9 @@ export default {
         copyEmailToClipboard: 'Copiar email al portapapeles',
         markAsUnread: 'Marcar como no leído',
         markAsRead: 'Marcar como leído',
-        editAction: ({action}) => `Edit ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
-        deleteAction: ({action}) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
-        deleteConfirmation: ({action}) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        editAction: ({action}: EditActionParams) => `Edit ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteAction: ({action}: DeleteActionParams) => `Eliminar ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
+        deleteConfirmation: ({action}: DeleteConfirmationParams) => `¿Estás seguro de que quieres eliminar este ${ReportActionsUtils.isMoneyRequestAction(action) ? 'pedido' : 'comentario'}`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
         flagAsOffensive: 'Marcar como ofensivo',
@@ -315,13 +395,15 @@ export default {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ',
         beginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.',
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
         beginningOfChatHistoryDomainRoomPartTwo: ' para chatear con compañeros, compartir consejos o hacer una pregunta.',
-        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) =>
+            `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
         beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.',
         beginningOfChatHistoryAdminOnlyPostingRoom: 'Solo los administradores pueden enviar mensajes en esta sala.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
+            `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
         beginningOfChatHistoryUserRoomPartOne: 'Este es el lugar para colaborar! 🎉\nUsa este espacio para chatear sobre cualquier cosa relacionada con ',
         beginningOfChatHistoryUserRoomPartTwo: '.',
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
@@ -330,7 +412,7 @@ export default {
         beginningOfChatHistoryPolicyExpenseChatPartThree: ' empieza aquí! 🎉 Este es el lugar donde chatear, pedir dinero y pagar.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
-        welcomeToRoom: ({roomName}) => `¡Bienvenido a ${roomName}!`,
+        welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
         usePlusButton: '\n\n¡También puedes usar el botón + de abajo para pedir dinero o asignar una tarea!',
     },
     reportAction: {
@@ -347,12 +429,14 @@ export default {
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'Esta sala de chat ha sido eliminada.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}) => `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}: ReportArchiveReasonsClosedParams) =>
+            `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha cerrado su cuenta.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}: ReportArchiveReasonsMergedParams) =>
             `Este chat de espacio de trabajo esta desactivado porque ${oldDisplayName} ha combinado su cuenta con ${displayName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}) =>
+        [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName}: ReportArchiveReasonsRemovedFromPolicyParams) =>
             `Este chat de espacio de trabajo esta desactivado porque ${displayName} ha dejado de ser miembro del espacio de trabajo ${policyName}.`,
-        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}) => `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
+        [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}: ReportArchiveReasonsPolicyDeletedParams) =>
+            `Este chat de espacio de trabajo esta desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
     },
     writeCapabilityPage: {
         label: 'Quién puede postear',
@@ -362,13 +446,10 @@ export default {
         },
     },
     sidebarScreen: {
-        fabAction: 'Nuevo chat',
-        newChat: 'Nuevo chat',
-        newGroup: 'Nuevo grupo',
-        newRoom: 'Nueva sala de chat',
         buttonSearch: 'Buscar',
         buttonMySettings: 'Mi configuración',
-        fabNewChat: 'Nuevo chat',
+        fabNewChat: 'Enviar mensaje',
+        fabNewChatExplained: 'Enviar mensaje',
         chatPinned: 'Chat fijado',
         draftedMessage: 'Mensaje borrador',
         listOfChatMessages: 'Lista de mensajes del chat',
@@ -376,6 +457,8 @@ export default {
         saveTheWorld: 'Salvar el mundo',
     },
     tabSelector: {
+        chat: 'Chat',
+        room: 'Sala',
         manual: 'Manual',
         scan: 'Escanear',
     },
@@ -402,9 +485,10 @@ export default {
         approved: 'Aprobado',
         cash: 'Efectivo',
         split: 'Dividir',
+        addToSplit: 'Añadir para dividir',
+        splitBill: 'Dividir factura',
         request: 'Solicitar',
         participants: 'Participantes',
-        splitBill: 'Dividir factura',
         requestMoney: 'Pedir dinero',
         sendMoney: 'Enviar dinero',
         pay: 'Pagar',
@@ -412,41 +496,48 @@ export default {
         pending: 'Pendiente',
         deleteReceipt: 'Eliminar recibo',
         receiptScanning: 'Escaneo de recibo en curso…',
+        receiptMissingDetails: 'Recibo con campos vacíos',
         receiptStatusTitle: 'Escaneando…',
         receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
-        requestCount: ({count, scanningReceipts = 0}) => `${count} solicitudes${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}`,
+        requestCount: ({count, scanningReceipts = 0}: RequestCountParams) => `${count} solicitudes${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}`,
         deleteRequest: 'Eliminar pedido',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar este pedido?',
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
-        settledPaypalMe: 'Pagado con PayPal.me',
-        settleExpensify: ({formattedAmount}) => `Pagar ${formattedAmount} con Expensify`,
+        settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => `Pagar ${formattedAmount} con Expensify`,
         payElsewhere: 'Pagar de otra forma',
-        settlePaypalMe: ({formattedAmount}) => `Pagar ${formattedAmount} con PayPal.me`,
-        requestAmount: ({amount}) => `solicitar ${amount}`,
-        splitAmount: ({amount}) => `dividir ${amount}`,
-        amountEach: ({amount}) => `${amount} cada uno`,
-        payerOwesAmount: ({payer, amount}) => `${payer} debe ${amount}`,
-        payerOwes: ({payer}) => `${payer} debe: `,
-        payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
-        payerPaid: ({payer}) => `${payer} pagó: `,
-        managerApproved: ({manager}) => `${manager} aprobó:`,
-        payerSettled: ({amount}) => `pagó ${amount}`,
-        waitingOnBankAccount: ({submitterDisplayName}) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
-        settledAfterAddedBankAccount: ({submitterDisplayName, amount}) => `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,
-        paidElsewhereWithAmount: ({amount}) => `pagó ${amount} de otra forma`,
-        paidUsingPaypalWithAmount: ({amount}) => `pagó ${amount} con PayPal.me`,
-        paidUsingExpensifyWithAmount: ({amount}) => `pagó ${amount} con Expensify`,
+        requestAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
+        splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
+        amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`,
+        payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} debe ${amount}`,
+        payerOwes: ({payer}: PayerOwesParams) => `${payer} debe: `,
+        payerPaidAmount: ({payer, amount}: PayerPaidAmountParams) => `${payer} pagó ${amount}`,
+        payerPaid: ({payer}: PayerPaidParams) => `${payer} pagó: `,
+        managerApproved: ({manager}: ManagerApprovedParams) => `${manager} aprobó:`,
+        payerSettled: ({amount}: PayerSettledParams) => `pagó ${amount}`,
+        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
+        settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
+            `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,
+        paidElsewhereWithAmount: ({amount}: PaidElsewhereWithAmountParams) => `pagó ${amount} de otra forma`,
+        paidWithExpensifyWithAmount: ({amount}: PaidWithExpensifyWithAmountParams) => `pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El importe de este informe no es válido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
-        threadRequestReportName: ({formattedAmount, comment}) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        changedTheRequest: 'cambió la solicitud',
+        setTheRequest: ({valueName, newValueToDisplay}: SetTheRequestParams) => `estableció ${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay}`,
+        removedTheRequest: ({valueName, oldValueToDisplay}: RemovedTheRequestParams) =>
+            `eliminó ${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} (previamente ${oldValueToDisplay})`,
+        updatedTheRequest: ({valueName, newValueToDisplay, oldValueToDisplay}: UpdatedTheRequestParams) =>
+            `cambío ${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
+        threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        tagSelection: ({tagName}: TagSelectionParams) => `Seleccione una ${tagName} para organizar mejor tu dinero`,
         error: {
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
             genericCreateFailureMessage: 'Error inesperado solicitando dinero, Por favor, inténtalo más tarde',
             genericDeleteFailureMessage: 'Error inesperado eliminando la solicitud de dinero. Por favor, inténtalo más tarde',
             genericEditFailureMessage: 'Error inesperado al guardar la solicitud de dinero. Por favor, inténtalo más tarde',
+            genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
         },
     },
     notificationPreferencesPage: {
@@ -466,11 +557,13 @@ export default {
         uploadPhoto: 'Subir foto',
         removePhoto: 'Eliminar foto',
         editImage: 'Editar foto',
+        viewPhoto: 'Ver foto',
+        imageUploadFailed: 'Error al cargar la imagen',
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
-        sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
-        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}) =>
+        sizeExceeded: ({maxUploadSizeInMB}: SizeExceededParams) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
+        resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}: ResolutionConstraintsParams) =>
             `Por favor, elige una imagen más grande que ${minHeightInPx}x${minWidthInPx} píxeles y más pequeña que ${maxHeightInPx}x${maxWidthInPx} píxeles.`,
-        notAllowedExtension: ({allowedExtensions}) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
+        notAllowedExtension: ({allowedExtensions}: NotAllowedExtensionParams) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Perfil',
@@ -485,6 +578,7 @@ export default {
         online: 'En línea',
         offline: 'Desconectado',
         syncing: 'Sincronizando',
+        profileAvatar: 'Perfil avatar',
     },
     loungeAccessPage: {
         loungeAccess: 'Acceso a la sala vip',
@@ -507,7 +601,7 @@ export default {
         helpTextAfterEmail: ' desde varias direcciones de correo electrónico.',
         pleaseVerify: 'Por favor, verifica este método de contacto',
         getInTouch: 'Utilizaremos este método de contacto cuando necesitemos contactarte.',
-        enterMagicCode: ({contactMethod}) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
+        enterMagicCode: ({contactMethod}: EnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
         setAsDefault: 'Establecer como predeterminado',
         yourDefaultContactMethod:
             'Este es tu método de contacto predeterminado. No podrás eliminarlo hasta que añadas otro método de contacto y lo marques como predeterminado pulsando "Establecer como predeterminado".',
@@ -526,6 +620,7 @@ export default {
             invalidContactMethod: 'Método de contacto no válido',
         },
         newContactMethod: 'Nuevo método de contacto',
+        goBackContactMethods: 'Volver a métodos de contacto',
     },
     pronouns: {
         coCos: 'Co / Cos',
@@ -648,17 +743,12 @@ export default {
         passwordUpdated: 'Contraseña actualizada!',
         allSet: 'Todo está listo. Guarda tu contraseña en un lugar seguro.',
     },
-    addPayPalMePage: {
-        enterYourUsernameToGetPaidViaPayPal: 'Recibe pagos vía PayPal.',
-        payPalMe: 'PayPal.me/',
-        yourPayPalUsername: 'Tu usuario de PayPal',
-        addPayPalAccount: 'Añadir cuenta de PayPal',
-        growlMessageOnSave: 'Tu nombre de usuario de PayPal se añadió correctamente',
-        updatePaypalAccount: 'Guardar cuenta PayPal',
-        growlMessageOnUpdate: 'Su nombre de usuario de PayPal se guardó con éxito',
-        formatError: 'Usuario PayPal.me no válido',
-        checkListOf: 'Consulta la lista de ',
-        supportedCurrencies: 'monedas admitidas',
+    privateNotes: {
+        title: 'Notas privadas',
+        personalNoteMessage: 'Guarda notas sobre este chat aquí. Usted es la única persona que puede añadir, editar o ver estas notas.',
+        sharedNoteMessage: 'Guarda notas sobre este chat aquí. Los empleados de Expensify y otros usuarios del dominio team.expensify.com pueden ver estas notas.',
+        notesUnavailable: 'No se han encontrado notas para el usuario',
+        composerLabel: 'Notas',
     },
     addDebitCardPage: {
         addADebitCard: 'Añadir una tarjeta de débito',
@@ -689,7 +779,6 @@ export default {
         setDefaultSuccess: 'Método de pago configurado',
         deleteAccount: 'Eliminar cuenta',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
-        deletePayPalSuccess: 'PayPal.me eliminada correctamente',
         error: {
             notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
             invalidBankAccount: 'Esta cuenta bancaria está temporalmente suspendida.',
@@ -699,9 +788,9 @@ export default {
         addBankAccountFailure: 'Ocurrió un error inesperado al intentar añadir la cuenta bancaria. Inténtalo de nuevo.',
     },
     transferAmountPage: {
-        transfer: ({amount}) => `Transferir${amount ? ` ${amount}` : ''}`,
+        transfer: ({amount}: TransferParams) => `Transferir${amount ? ` ${amount}` : ''}`,
         instant: 'Instante',
-        instantSummary: ({rate, minAmount}) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
+        instantSummary: ({rate, minAmount}: InstantSummaryParams) => `Tarifa del ${rate}% (${minAmount} mínimo)`,
         ach: '1-3 días laborales',
         achSummary: 'Sin cargo',
         whichAccount: '¿Qué cuenta?',
@@ -833,7 +922,7 @@ export default {
         },
         cannotGetAccountDetails: 'No se pudieron cargar los detalles de tu cuenta. Por favor, intenta iniciar sesión de nuevo.',
         loginForm: 'Formulario de inicio de sesión',
-        notYou: ({user}) => `¿No eres ${user}?`,
+        notYou: ({user}: NotYouParams) => `¿No eres ${user}?`,
     },
     personalDetails: {
         error: {
@@ -849,28 +938,30 @@ export default {
         legalLastName: 'Apellidos legales',
         homeAddress: 'Domicilio',
         error: {
-            dateShouldBeBefore: ({dateString}) => `La fecha debe ser anterior a ${dateString}.`,
-            dateShouldBeAfter: ({dateString}) => `La fecha debe ser posterior a ${dateString}.`,
-            incorrectZipFormat: ({zipFormat}) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
+            dateShouldBeBefore: ({dateString}: DateShouldBeBeforeParams) => `La fecha debe ser anterior a ${dateString}.`,
+            dateShouldBeAfter: ({dateString}: DateShouldBeAfterParams) => `La fecha debe ser posterior a ${dateString}.`,
+            incorrectZipFormat: ({zipFormat}: IncorrectZipFormatParams) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
             hasInvalidCharacter: 'El nombre sólo puede incluir letras.',
         },
     },
     resendValidationForm: {
         linkHasBeenResent: 'El enlace se ha reenviado',
-        weSentYouMagicSignInLink: ({login, loginType}) => `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
+        weSentYouMagicSignInLink: ({login, loginType}: WeSentYouMagicSignInLinkParams) =>
+            `Te he enviado un hiperenlace mágico para iniciar sesión a ${login}. Por favor, revisa tu ${loginType}`,
         resendLink: 'Reenviar enlace',
     },
     unlinkLoginForm: {
-        toValidateLogin: ({primaryLogin, secondaryLogin}) => `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
-        noLongerHaveAccess: ({primaryLogin}) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
+        toValidateLogin: ({primaryLogin, secondaryLogin}: ToValidateLoginParams) =>
+            `Para validar ${secondaryLogin}, reenvía el código mágico desde la Configuración de la cuenta de ${primaryLogin}.`,
+        noLongerHaveAccess: ({primaryLogin}: NoLongerHaveAccessParams) => `Si ya no tienes acceso a ${primaryLogin} por favor, desvincula las cuentas.`,
         unlink: 'Desvincular',
         linkSent: '¡Enlace enviado!',
         succesfullyUnlinkedLogin: '¡Nombre de usuario secundario desvinculado correctamente!',
     },
     emailDeliveryFailurePage: {
-        ourEmailProvider: ({login}) =>
+        ourEmailProvider: ({login}: OurEmailProviderParams) =>
             `Nuestro proveedor de correo electrónico ha suspendido temporalmente los correos electrónicos a ${login} debido a problemas de entrega. Para desbloquear el inicio de sesión, sigue estos pasos:`,
-        confirmThat: ({login}) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
+        confirmThat: ({login}: ConfirmThatParams) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
         emailAliases:
             'Los alias de correo electrónico como "expenses@domain.com" deben tener acceso a su propia bandeja de entrada de correo electrónico para que sea un inicio de sesión válido de Expensify.',
         ensureYourEmailClient: 'Asegúrese de que su cliente de correo electrónico permita correos electrónicos de expensify.com. ',
@@ -883,7 +974,9 @@ export default {
         localTime: 'Hora local',
     },
     newChatPage: {
+        createChat: 'Crear chat',
         createGroup: 'Crear grupo',
+        addToGroup: 'Añadir al grupo',
     },
     yearPickerPage: {
         year: 'Año',
@@ -916,7 +1009,7 @@ export default {
         save: 'Guardar',
         message: 'Mensaje',
         untilTomorrow: 'Hasta mañana',
-        untilTime: ({time}) => {
+        untilTime: ({time}: UntilTimeParams) => {
             // Check for HH:MM AM/PM format and starts with '01:'
             if (CONST.REGEX.TIME_STARTS_01.test(time)) {
                 return `Hasta la ${time}`;
@@ -933,7 +1026,7 @@ export default {
             return `Hasta ${time}`;
         },
     },
-    stepCounter: ({step, total, text}) => {
+    stepCounter: ({step, total, text}: StepCounterParams) => {
         let result = `Paso ${step}`;
 
         if (total) {
@@ -1019,7 +1112,7 @@ export default {
     messages: {
         errorMessageInvalidPhone: `Por favor, introduce un número de teléfono válido sin paréntesis o guiones. Si reside fuera de Estados Unidos, por favor incluye el prefijo internacional (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
         errorMessageInvalidEmail: 'Email inválido',
-        userIsAlreadyMemberOfWorkspace: ({login, workspace}) => `${login} ya es miembro de ${workspace}`,
+        userIsAlreadyMemberOfWorkspace: ({login, workspace}: UserIsAlreadyMemberOfWorkspaceParams) => `${login} ya es miembro de ${workspace}`,
     },
     onfidoStep: {
         acceptTerms: 'Al continuar con la solicitud para activar su billetera Expensify, confirma que ha leído, comprende y acepta ',
@@ -1227,7 +1320,8 @@ export default {
             unavailable: 'Espacio de trabajo no disponible',
             memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
             notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda añadirte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
-            goToRoom: ({roomName}) => `Ir a la sala ${roomName}`,
+            goToRoom: ({roomName}: GoToRoomParams) => `Ir a la sala ${roomName}`,
+            workspaceAvatar: 'Espacio de trabajo avatar',
         },
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
@@ -1271,7 +1365,6 @@ export default {
             captureReceipts: 'Captura recibos',
             fastReimbursementsHappyMembers: '¡Reembolsos rápidos = miembros felices!',
             kilometers: 'Kilómetros',
-            miles: 'Millas',
             viewAllReceipts: 'Ver todos los recibos',
             reimburseReceipts: 'Reembolsar recibos',
             trackDistance: 'Medir distancia',
@@ -1285,6 +1378,7 @@ export default {
             fastReimbursementsVBACopy: '¡Todo listo para reembolsar recibos desde tu cuenta bancaria!',
             updateCustomUnitError: 'Los cambios no han podido ser guardados. El espacio de trabajo ha sido modificado mientras estabas desconectado. Por favor, inténtalo de nuevo.',
             invalidRateError: 'Por favor, introduce una tarifa válida',
+            lowRateError: 'La tarifa debe ser mayor que 0',
         },
         bills: {
             manageYourBills: 'Gestiona tus facturas',
@@ -1325,7 +1419,7 @@ 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}) =>
+            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.`,
         },
         editor: {
@@ -1399,15 +1493,17 @@ export default {
         restrictedDescription: 'Sólo las personas en tu espacio de trabajo pueden encontrar esta sala',
         privateDescription: 'Sólo las personas que están invitadas a esta sala pueden encontrarla',
         publicDescription: 'Cualquier persona puede unirse a esta sala',
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         public_announceDescription: 'Cualquier persona puede unirse a esta sala',
         createRoom: 'Crea una sala de chat',
         roomAlreadyExistsError: 'Ya existe una sala con este nombre',
-        roomNameReservedError: ({reservedName}) => `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
+        roomNameReservedError: ({reservedName}: RoomNameReservedErrorParams) =>
+            `${reservedName} es el nombre una sala por defecto de todos los espacios de trabajo. Por favor, elige otro nombre.`,
         roomNameInvalidError: 'Los nombres de las salas solo pueden contener minúsculas, números y guiones',
         pleaseEnterRoomName: 'Por favor, escribe el nombre de una sala',
         pleaseSelectWorkspace: 'Por favor, selecciona un espacio de trabajo',
-        renamedRoomAction: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
-        roomRenamedTo: ({newName}) => `Sala renombrada a ${newName}`,
+        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
+        roomRenamedTo: ({newName}: RoomRenamedToParams) => `Sala renombrada a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
         growlMessageOnRenameError: 'No se ha podido cambiar el nombre del espacio de trabajo, por favor, comprueba tu conexión e inténtalo de nuevo.',
@@ -1415,6 +1511,7 @@ export default {
             restricted: 'Restringida',
             private: 'Privada',
             public: 'Público',
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             public_announce: 'Anuncio Público',
         },
     },
@@ -1436,7 +1533,7 @@ export default {
         completed: 'Completada',
         messages: {
             completed: 'tarea completada',
-            canceled: 'tarea cancelada',
+            canceled: 'tarea eliminado',
             reopened: 'tarea reabrir',
             error: 'No tiene permiso para realizar la acción solicitada.',
         },
@@ -1454,7 +1551,7 @@ export default {
             openShortcutDialog: 'Abre el cuadro de diálogo de métodos abreviados de teclado',
             escape: 'Diálogos de escape',
             search: 'Abrir diálogo de búsqueda',
-            newGroup: 'Nueva pantalla de grupo',
+            newChat: 'Nueva pantalla de chat',
             copy: 'Copiar comentario',
         },
     },
@@ -1558,8 +1655,8 @@ export default {
         noActivityYet: 'Sin actividad todavía',
     },
     chronos: {
-        oooEventSummaryFullDay: ({summary, dayCount, date}) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
-        oooEventSummaryPartialDay: ({summary, timePeriod, date}) => `${summary} de ${timePeriod} del ${date}`,
+        oooEventSummaryFullDay: ({summary, dayCount, date}: OOOEventSummaryFullDayParams) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
+        oooEventSummaryPartialDay: ({summary, timePeriod, date}: OOOEventSummaryPartialDayParams) => `${summary} de ${timePeriod} del ${date}`,
     },
     footer: {
         features: 'Características',
@@ -2068,6 +2165,7 @@ export default {
     parentReportAction: {
         deletedMessage: '[Mensaje eliminado]',
         deletedRequest: '[Pedido eliminado]',
+        deletedTask: '[Tarea eliminado]',
         hiddenMessage: '[Mensaje oculto]',
     },
     threads: {
@@ -2075,7 +2173,7 @@ export default {
         reply: 'Respuesta',
         from: 'De',
         in: 'en',
-        parentNavigationSummary: ({rootReportName, workspaceName}) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
+        parentNavigationSummary: ({rootReportName, workspaceName}: ParentNavigationSummaryParams) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
     },
     qrCodes: {
         copyUrlToClipboard: 'Copiar URL al portapapeles',
@@ -2146,18 +2244,4 @@ export default {
             selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida',
         },
     },
-    countrySelectorModal: {
-        placeholderText: 'Buscar para ver opciones',
-    },
-    stateSelectorModal: {
-        placeholderText: 'Buscar para ver opciones',
-    },
-    demos: {
-        saastr: {
-            signInWelcome: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
-        },
-        sbe: {
-            signInWelcome: '¡Bienvenido a Small Business Expo! Recupera el dinero de tu viaje.',
-        },
-    },
-};
+} satisfies EnglishTranslation;
diff --git a/src/languages/translations.js b/src/languages/translations.js
deleted file mode 100644
index c8dd8c8ab0e0..000000000000
--- a/src/languages/translations.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import en from './en';
-import es from './es';
-import esES from './es-ES';
-
-export default {
-    en,
-    es,
-    'es-ES': esES,
-};
diff --git a/src/languages/translations.ts b/src/languages/translations.ts
new file mode 100644
index 000000000000..d228394589b2
--- /dev/null
+++ b/src/languages/translations.ts
@@ -0,0 +1,50 @@
+import en from './en';
+import es from './es';
+import esES from './es-ES';
+import type {TranslationBase, TranslationFlatObject} from './types';
+
+/**
+ * Converts an object to it's flattened version.
+ *
+ * Ex:
+ * Input: { common: { yes: "Yes", no: "No" }}
+ * Output: { "common.yes": "Yes", "common.no": "No" }
+ */
+// Necessary to export so that it is accessible to the unit tests
+// eslint-disable-next-line rulesdir/no-inline-named-export
+export function flattenObject(obj: TranslationBase): TranslationFlatObject {
+    const result: Record<string, unknown> = {};
+
+    const recursive = (data: TranslationBase, key: string): void => {
+        // If the data is a function or not a object (eg. a string or array),
+        // it's the final value for the key being built and there is no need
+        // for more recursion
+        if (typeof data === 'function' || Array.isArray(data) || !(typeof data === 'object' && !!data)) {
+            result[key] = data;
+        } else {
+            let isEmpty = true;
+
+            // Recursive call to the keys and connect to the respective data
+            Object.keys(data).forEach((k) => {
+                isEmpty = false;
+                recursive(data[k] as TranslationBase, key ? `${key}.${k}` : k);
+            });
+
+            // Check for when the object is empty but a key exists, so that
+            // it defaults to an empty object
+            if (isEmpty && key) {
+                result[key] = '';
+            }
+        }
+    };
+
+    recursive(obj, '');
+    return result as TranslationFlatObject;
+}
+
+export default {
+    en: flattenObject(en),
+    es: flattenObject(es),
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'es-ES': esES,
+};
diff --git a/src/languages/types.ts b/src/languages/types.ts
new file mode 100644
index 000000000000..86813841f177
--- /dev/null
+++ b/src/languages/types.ts
@@ -0,0 +1,304 @@
+import en from './en';
+
+type AddressLineParams = {
+    lineNumber: number;
+};
+
+type CharacterLimitParams = {
+    limit: number;
+};
+
+type MaxParticipantsReachedParams = {
+    count: number;
+};
+
+type ZipCodeExampleFormatParams = {
+    zipSampleFormat: string;
+};
+
+type LoggedInAsParams = {
+    email: string;
+};
+
+type NewFaceEnterMagicCodeParams = {
+    login: string;
+};
+
+type WelcomeEnterMagicCodeParams = {
+    login: string;
+};
+
+type AlreadySignedInParams = {
+    email: string;
+};
+
+type GoBackMessageParams = {
+    provider: string;
+};
+
+type LocalTimeParams = {
+    user: string;
+    time: string;
+};
+
+type EditActionParams = {
+    action: NonNullable<unknown>;
+};
+
+type DeleteActionParams = {
+    action: NonNullable<unknown>;
+};
+
+type DeleteConfirmationParams = {
+    action: NonNullable<unknown>;
+};
+
+type BeginningOfChatHistoryDomainRoomPartOneParams = {
+    domainRoom: string;
+};
+
+type BeginningOfChatHistoryAdminRoomPartOneParams = {
+    workspaceName: string;
+};
+
+type BeginningOfChatHistoryAnnounceRoomPartOneParams = {
+    workspaceName: string;
+};
+
+type BeginningOfChatHistoryAnnounceRoomPartTwo = {
+    workspaceName: string;
+};
+
+type WelcomeToRoomParams = {
+    roomName: string;
+};
+
+type ReportArchiveReasonsClosedParams = {
+    displayName: string;
+};
+
+type ReportArchiveReasonsMergedParams = {
+    displayName: string;
+    oldDisplayName: string;
+};
+
+type ReportArchiveReasonsRemovedFromPolicyParams = {
+    displayName: string;
+    policyName: string;
+};
+
+type ReportArchiveReasonsPolicyDeletedParams = {
+    policyName: string;
+};
+
+type RequestCountParams = {
+    count: number;
+    scanningReceipts: number;
+};
+
+type SettleExpensifyCardParams = {
+    formattedAmount: string;
+};
+
+type RequestAmountParams = {amount: number};
+
+type SplitAmountParams = {amount: number};
+
+type AmountEachParams = {amount: number};
+
+type PayerOwesAmountParams = {payer: string; amount: number};
+
+type PayerOwesParams = {payer: string};
+
+type PayerPaidAmountParams = {payer: string; amount: number};
+
+type ManagerApprovedParams = {manager: string};
+
+type PayerPaidParams = {payer: string};
+
+type PayerSettledParams = {amount: number};
+
+type WaitingOnBankAccountParams = {submitterDisplayName: string};
+
+type SettledAfterAddedBankAccountParams = {submitterDisplayName: string; amount: string};
+
+type PaidElsewhereWithAmountParams = {amount: string};
+
+type PaidWithExpensifyWithAmountParams = {amount: string};
+
+type ThreadRequestReportNameParams = {formattedAmount: string; comment: string};
+
+type ThreadSentMoneyReportNameParams = {formattedAmount: string; comment: string};
+
+type SizeExceededParams = {maxUploadSizeInMB: number};
+
+type ResolutionConstraintsParams = {minHeightInPx: number; minWidthInPx: number; maxHeightInPx: number; maxWidthInPx: number};
+
+type NotAllowedExtensionParams = {allowedExtensions: string[]};
+
+type EnterMagicCodeParams = {contactMethod: string};
+
+type TransferParams = {amount: string};
+
+type InstantSummaryParams = {rate: number; minAmount: number};
+
+type NotYouParams = {user: string};
+
+type DateShouldBeBeforeParams = {dateString: string};
+
+type DateShouldBeAfterParams = {dateString: string};
+
+type IncorrectZipFormatParams = {zipFormat?: string};
+
+type WeSentYouMagicSignInLinkParams = {login: string; loginType: string};
+
+type ToValidateLoginParams = {primaryLogin: string; secondaryLogin: string};
+
+type NoLongerHaveAccessParams = {primaryLogin: string};
+
+type OurEmailProviderParams = {login: string};
+
+type ConfirmThatParams = {login: string};
+
+type UntilTimeParams = {time: string};
+
+type StepCounterParams = {step: number; total?: number; text?: string};
+
+type UserIsAlreadyMemberOfWorkspaceParams = {login: string; workspace: string};
+
+type GoToRoomParams = {roomName: string};
+
+type WelcomeNoteParams = {workspaceName: string};
+
+type RoomNameReservedErrorParams = {reservedName: string};
+
+type RenamedRoomActionParams = {oldName: string; newName: string};
+
+type RoomRenamedToParams = {newName: string};
+
+type OOOEventSummaryFullDayParams = {summary: string; dayCount: number; date: string};
+
+type OOOEventSummaryPartialDayParams = {summary: string; timePeriod: string; date: string};
+
+type ParentNavigationSummaryParams = {rootReportName: string; workspaceName: string};
+
+type SetTheRequestParams = {valueName: string; newValueToDisplay: string};
+
+type RemovedTheRequestParams = {valueName: string; oldValueToDisplay: string};
+
+type UpdatedTheRequestParams = {valueName: string; newValueToDisplay: string; oldValueToDisplay: string};
+
+type TagSelectionParams = {tagName: string};
+
+/* Translation Object types */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type TranslationBaseValue = string | string[] | ((...args: any[]) => string);
+
+type TranslationBase = {[key: string]: TranslationBaseValue | TranslationBase};
+
+/* Flat Translation Object types */
+// Flattens an object and returns concatenations of all the keys of nested objects
+type FlattenObject<TObject, TPrefix extends string = ''> = {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [TKey in keyof TObject]: TObject[TKey] extends (...args: any[]) => any
+        ? `${TPrefix}${TKey & string}`
+        : // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        TObject[TKey] extends any[]
+        ? `${TPrefix}${TKey & string}`
+        : // eslint-disable-next-line @typescript-eslint/ban-types
+        TObject[TKey] extends object
+        ? FlattenObject<TObject[TKey], `${TPrefix}${TKey & string}.`>
+        : `${TPrefix}${TKey & string}`;
+}[keyof TObject];
+
+// Retrieves a type for a given key path (calculated from the type above)
+type TranslateType<TObject, TPath extends string> = TPath extends keyof TObject
+    ? TObject[TPath]
+    : TPath extends `${infer TKey}.${infer TRest}`
+    ? TKey extends keyof TObject
+        ? TranslateType<TObject[TKey], TRest>
+        : never
+    : never;
+
+type EnglishTranslation = typeof en;
+
+type TranslationPaths = FlattenObject<EnglishTranslation>;
+
+type TranslationFlatObject = {
+    [TKey in TranslationPaths]: TranslateType<EnglishTranslation, TKey>;
+};
+
+export type {
+    TranslationBase,
+    EnglishTranslation,
+    TranslationFlatObject,
+    AddressLineParams,
+    CharacterLimitParams,
+    MaxParticipantsReachedParams,
+    ZipCodeExampleFormatParams,
+    LoggedInAsParams,
+    NewFaceEnterMagicCodeParams,
+    WelcomeEnterMagicCodeParams,
+    AlreadySignedInParams,
+    GoBackMessageParams,
+    LocalTimeParams,
+    EditActionParams,
+    DeleteActionParams,
+    DeleteConfirmationParams,
+    BeginningOfChatHistoryDomainRoomPartOneParams,
+    BeginningOfChatHistoryAdminRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartOneParams,
+    BeginningOfChatHistoryAnnounceRoomPartTwo,
+    WelcomeToRoomParams,
+    ReportArchiveReasonsClosedParams,
+    ReportArchiveReasonsMergedParams,
+    ReportArchiveReasonsRemovedFromPolicyParams,
+    ReportArchiveReasonsPolicyDeletedParams,
+    RequestCountParams,
+    SettleExpensifyCardParams,
+    RequestAmountParams,
+    SplitAmountParams,
+    AmountEachParams,
+    PayerOwesAmountParams,
+    PayerOwesParams,
+    PayerPaidAmountParams,
+    PayerPaidParams,
+    ManagerApprovedParams,
+    PayerSettledParams,
+    WaitingOnBankAccountParams,
+    SettledAfterAddedBankAccountParams,
+    PaidElsewhereWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
+    ThreadRequestReportNameParams,
+    ThreadSentMoneyReportNameParams,
+    SizeExceededParams,
+    ResolutionConstraintsParams,
+    NotAllowedExtensionParams,
+    EnterMagicCodeParams,
+    TransferParams,
+    InstantSummaryParams,
+    NotYouParams,
+    DateShouldBeBeforeParams,
+    DateShouldBeAfterParams,
+    IncorrectZipFormatParams,
+    WeSentYouMagicSignInLinkParams,
+    ToValidateLoginParams,
+    NoLongerHaveAccessParams,
+    OurEmailProviderParams,
+    ConfirmThatParams,
+    UntilTimeParams,
+    StepCounterParams,
+    UserIsAlreadyMemberOfWorkspaceParams,
+    GoToRoomParams,
+    WelcomeNoteParams,
+    RoomNameReservedErrorParams,
+    RenamedRoomActionParams,
+    RoomRenamedToParams,
+    OOOEventSummaryFullDayParams,
+    OOOEventSummaryPartialDayParams,
+    ParentNavigationSummaryParams,
+    SetTheRequestParams,
+    UpdatedTheRequestParams,
+    RemovedTheRequestParams,
+    TagSelectionParams,
+};
diff --git a/src/libs/API.js b/src/libs/API.js
index 9405fb8f3a51..491503f07381 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -21,7 +21,8 @@ Request.use(Middleware.RecheckConnection);
 // Reauthentication - Handles jsonCode 407 which indicates an expired authToken. We need to reauthenticate and get a new authToken with our stored credentials.
 Request.use(Middleware.Reauthentication);
 
-// SaveResponseInOnyx - Merges either the successData or failureData into Onyx depending on if the call was successful or not
+// SaveResponseInOnyx - Merges either the successData or failureData into Onyx depending on if the call was successful or not. This needs to be the LAST middleware we use, don't add any
+// middlewares after this, because the SequentialQueue depends on the result of this middleware to pause the queue (if needed) to bring the app to an up-to-date state.
 Request.use(Middleware.SaveResponseInOnyx);
 
 /**
diff --git a/src/libs/AppStateMonitor/index.js b/src/libs/AppStateMonitor/index.ts
similarity index 71%
rename from src/libs/AppStateMonitor/index.js
rename to src/libs/AppStateMonitor/index.ts
index 12370382919e..5c206579944d 100644
--- a/src/libs/AppStateMonitor/index.js
+++ b/src/libs/AppStateMonitor/index.ts
@@ -1,20 +1,15 @@
-import {AppState} from 'react-native';
+import {AppState, AppStateStatus} from 'react-native';
 import CONST from '../../CONST';
 import shouldReportActivity from './shouldReportActivity';
 
-let appState = CONST.APP_STATE.ACTIVE;
+let appState: AppStateStatus = CONST.APP_STATE.ACTIVE;
 
 /**
  * Listener that will only fire the callback when the user has become active.
- *
- * @param {Function} callback
- * @returns {Function} to unsubscribe
+ * @returns callback to unsubscribe
  */
-function addBecameActiveListener(callback) {
-    /**
-     * @param {String} state
-     */
-    function appStateChangeCallback(state) {
+function addBecameActiveListener(callback: () => void): () => void {
+    function appStateChangeCallback(state: AppStateStatus) {
         if (shouldReportActivity && (appState === CONST.APP_STATE.INACTIVE || appState === CONST.APP_STATE.BACKGROUND) && state === CONST.APP_STATE.ACTIVE) {
             callback();
         }
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.native.js b/src/libs/AppStateMonitor/shouldReportActivity/index.native.js
deleted file mode 100644
index ff3177babdde..000000000000
--- a/src/libs/AppStateMonitor/shouldReportActivity/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default true;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts b/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts
new file mode 100644
index 000000000000..0e5fdb57a597
--- /dev/null
+++ b/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts
@@ -0,0 +1,5 @@
+import ShouldReportActivity from './types';
+
+const shouldReportActivity: ShouldReportActivity = true;
+
+export default shouldReportActivity;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.js b/src/libs/AppStateMonitor/shouldReportActivity/index.ts
similarity index 70%
rename from src/libs/AppStateMonitor/shouldReportActivity/index.js
rename to src/libs/AppStateMonitor/shouldReportActivity/index.ts
index 05939ab7eb8d..db326345714e 100644
--- a/src/libs/AppStateMonitor/shouldReportActivity/index.js
+++ b/src/libs/AppStateMonitor/shouldReportActivity/index.ts
@@ -1,4 +1,8 @@
+import ShouldReportActivity from './types';
+
 // We only need to report when the app becomes active on native since web maintains most of it's network functions while
 // in the "background" and the concept is not quite the same on mobile. We avoid setting this to true for web since
 // the event would fire much more frequently than it does on native causing performance issues.
-export default false;
+const shouldReportActivity: ShouldReportActivity = false;
+
+export default shouldReportActivity;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/types.ts b/src/libs/AppStateMonitor/shouldReportActivity/types.ts
new file mode 100644
index 000000000000..2341c0d5cbf1
--- /dev/null
+++ b/src/libs/AppStateMonitor/shouldReportActivity/types.ts
@@ -0,0 +1,3 @@
+type ShouldReportActivity = boolean;
+
+export default ShouldReportActivity;
diff --git a/src/libs/Browser/index.js b/src/libs/Browser/index.ts
similarity index 100%
rename from src/libs/Browser/index.js
rename to src/libs/Browser/index.ts
diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.ts
similarity index 88%
rename from src/libs/Browser/index.web.js
rename to src/libs/Browser/index.web.ts
index 32f6392aef76..064358c6bed5 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.ts
@@ -5,12 +5,12 @@ import ROUTES from '../../ROUTES';
 /**
  * Fetch browser name from UA string
  *
- * @return {String} e.g. Chrome
  */
-function getBrowser() {
+function getBrowser(): string {
     const {userAgent} = window.navigator;
-    let match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) || [];
-    let temp;
+    const match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) ?? [];
+    let temp: RegExpMatchArray | null;
+    let browserName = '';
 
     if (/trident/i.test(match[1])) {
         return 'IE';
@@ -28,15 +28,14 @@ function getBrowser() {
         }
     }
 
-    match = match[1] ? match[1] : navigator.appName;
-    return match ? match.toLowerCase() : CONST.BROWSER.OTHER;
+    browserName = match[1] ?? navigator.appName;
+    return browserName ? browserName.toLowerCase() : CONST.BROWSER.OTHER;
 }
 
 /**
  * Whether the platform is a mobile browser.
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
  *
- * @returns {Boolean}
  */
 function isMobile() {
     return /Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Silk|Opera Mini/i.test(navigator.userAgent);
@@ -45,7 +44,6 @@ function isMobile() {
 /**
  * Checks if requesting user agent is Safari browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileSafari() {
     const userAgent = navigator.userAgent;
@@ -55,7 +53,6 @@ function isMobileSafari() {
 /**
  * Checks if requesting user agent is Chrome browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileChrome() {
     const userAgent = navigator.userAgent;
@@ -68,8 +65,6 @@ function isSafari() {
 
 /**
  * The session information needs to be passed to the Desktop app, and the only way to do that is by using query params. There is no other way to transfer the data.
- * @param {String} shortLivedAuthToken
- * @param {String} email
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
@@ -95,8 +90,9 @@ function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
         document.body.appendChild(iframe);
-        iframe.contentWindow.location.href = expensifyDeeplinkUrl;
-
+        if (iframe.contentWindow) {
+            iframe.contentWindow.location.href = expensifyDeeplinkUrl;
+        }
         // Since we're creating an iframe for Safari to handle deeplink,
         // we need to give Safari some time to open the pop-up window.
         // After that we can just remove the iframe.
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index bbb938a666ac..beb0ea800091 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -1,3 +1,6 @@
+import {Card} from '../types/onyx';
+import CONST from '../CONST';
+
 /**
  * @returns string with a month in MM format
  */
@@ -15,4 +18,11 @@ function getYearFromExpirationDateString(expirationDateString: string) {
     return cardYear.length === 2 ? `20${cardYear}` : cardYear;
 }
 
-export {getMonthFromExpirationDateString, getYearFromExpirationDateString};
+function getCompanyCards(cardList: {string: Card}) {
+    if (!cardList) {
+        return [];
+    }
+    return Object.values(cardList).filter((card) => card.bank !== CONST.EXPENSIFY_CARD.BANK);
+}
+
+export {getMonthFromExpirationDateString, getYearFromExpirationDateString, getCompanyCards};
diff --git a/src/libs/CollectionUtils.js b/src/libs/CollectionUtils.js
deleted file mode 100644
index 3625c68d2c39..000000000000
--- a/src/libs/CollectionUtils.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ from 'underscore';
-
-/**
- * Return the highest item in a numbered collection
- *
- * e.g. {1: '1', 2: '2', 3: '3'} -> '3'
- *
- * @param {Object} object
- * @returns {*}
- */
-function lastItem(object = {}) {
-    const lastKey = _.last(_.keys(object)) || 0;
-    return object[lastKey];
-}
-
-/**
- * Used to grab the id for a particular collection item's key.
- * e.g. reportActions_1 -> 1
- *
- * @param {String} key
- * @returns {String}
- */
-function extractCollectionItemID(key) {
-    return key.split('_')[1];
-}
-
-export {lastItem, extractCollectionItemID};
diff --git a/src/libs/CollectionUtils.ts b/src/libs/CollectionUtils.ts
new file mode 100644
index 000000000000..ac47633c2e08
--- /dev/null
+++ b/src/libs/CollectionUtils.ts
@@ -0,0 +1,23 @@
+import {OnyxCollectionKey} from '../ONYXKEYS';
+
+/**
+ * Return the highest item in a numbered collection
+ *
+ * e.g. {1: '1', 2: '2', 3: '3'} -> '3'
+ *
+ * Use this only for collections that are numbered in other cases it will return the last item in the object not the highest
+ */
+function lastItem<T>(object: Record<string, T> = {}): T | undefined {
+    const lastKey = Object.keys(object).pop() ?? 0;
+    return object[lastKey];
+}
+
+/**
+ * Used to grab the id for a particular collection item's key.
+ * e.g. reportActions_1 -> 1
+ */
+function extractCollectionItemID(key: `${OnyxCollectionKey}${string}`): string {
+    return key.split('_')[1];
+}
+
+export {lastItem, extractCollectionItemID};
diff --git a/src/libs/ControlSelection/index.native.js b/src/libs/ControlSelection/index.native.ts
similarity index 55%
rename from src/libs/ControlSelection/index.native.js
rename to src/libs/ControlSelection/index.native.ts
index ea91f4bbb1da..e9a1e4e9ad5b 100644
--- a/src/libs/ControlSelection/index.native.js
+++ b/src/libs/ControlSelection/index.native.ts
@@ -1,11 +1,15 @@
+import ControlSelectionModule from './types';
+
 function block() {}
 function unblock() {}
 function blockElement() {}
 function unblockElement() {}
 
-export default {
+const ControlSelection: ControlSelectionModule = {
     block,
     unblock,
     blockElement,
     unblockElement,
 };
+
+export default ControlSelection;
diff --git a/src/libs/ControlSelection/index.js b/src/libs/ControlSelection/index.ts
similarity index 64%
rename from src/libs/ControlSelection/index.js
rename to src/libs/ControlSelection/index.ts
index 7269960d744a..9625b4e49787 100644
--- a/src/libs/ControlSelection/index.js
+++ b/src/libs/ControlSelection/index.ts
@@ -1,4 +1,5 @@
-import _ from 'underscore';
+import ControlSelectionModule from './types';
+import CustomRefObject from '../../types/utils/CustomRefObject';
 
 /**
  * Block selection on the whole app
@@ -18,10 +19,9 @@ function unblock() {
 
 /**
  * Block selection on particular element
- * @param {Element} ref
  */
-function blockElement(ref) {
-    if (_.isNull(ref)) {
+function blockElement<T>(ref?: CustomRefObject<T> | null) {
+    if (!ref) {
         return;
     }
 
@@ -31,10 +31,9 @@ function blockElement(ref) {
 
 /**
  * Unblock selection on particular element
- * @param {Element} ref
  */
-function unblockElement(ref) {
-    if (_.isNull(ref)) {
+function unblockElement<T>(ref?: CustomRefObject<T> | null) {
+    if (!ref) {
         return;
     }
 
@@ -42,9 +41,11 @@ function unblockElement(ref) {
     ref.onselectstart = () => true;
 }
 
-export default {
+const ControlSelection: ControlSelectionModule = {
     block,
     unblock,
     blockElement,
     unblockElement,
 };
+
+export default ControlSelection;
diff --git a/src/libs/ControlSelection/types.ts b/src/libs/ControlSelection/types.ts
new file mode 100644
index 000000000000..5706a4981d30
--- /dev/null
+++ b/src/libs/ControlSelection/types.ts
@@ -0,0 +1,10 @@
+import CustomRefObject from '../../types/utils/CustomRefObject';
+
+type ControlSelectionModule = {
+    block: () => void;
+    unblock: () => void;
+    blockElement: <T>(ref?: CustomRefObject<T> | null) => void;
+    unblockElement: <T>(ref?: CustomRefObject<T> | null) => void;
+};
+
+export default ControlSelectionModule;
diff --git a/src/libs/CurrencyUtils.js b/src/libs/CurrencyUtils.js
index 271086ede36e..6cbb0db7661b 100644
--- a/src/libs/CurrencyUtils.js
+++ b/src/libs/CurrencyUtils.js
@@ -56,6 +56,16 @@ function getLocalizedCurrencySymbol(currencyCode) {
     return _.find(parts, (part) => part.type === 'currency').value;
 }
 
+/**
+ * Get the currency symbol for a currency(ISO 4217) Code
+ *
+ * @param {String} currencyCode
+ * @returns {String|undefined}
+ */
+function getCurrencySymbol(currencyCode) {
+    return lodashGet(currencyList, [currencyCode, 'symbol']);
+}
+
 /**
  * Whether the currency symbol is left-to-right.
  *
@@ -118,4 +128,4 @@ function convertToDisplayString(amountInCents, currency = CONST.CURRENCY.USD) {
     });
 }
 
-export {getCurrencyDecimals, getCurrencyUnit, getLocalizedCurrencySymbol, isCurrencySymbolLTR, convertToBackendAmount, convertToFrontendAmount, convertToDisplayString};
+export {getCurrencyDecimals, getCurrencyUnit, getLocalizedCurrencySymbol, getCurrencySymbol, isCurrencySymbolLTR, convertToBackendAmount, convertToFrontendAmount, convertToDisplayString};
diff --git a/src/libs/DistanceRequestUtils.js b/src/libs/DistanceRequestUtils.js
new file mode 100644
index 000000000000..34fa14163835
--- /dev/null
+++ b/src/libs/DistanceRequestUtils.js
@@ -0,0 +1,111 @@
+import _ from 'underscore';
+import CONST from '../CONST';
+import * as CurrencyUtils from './CurrencyUtils';
+
+/**
+ * Retrieves the default mileage rate based on a given policy.
+ *
+ * @param {Object} policy - The policy from which to extract the default mileage rate.
+ * @param {Object} [policy.customUnits] - Custom units defined in the policy.
+ * @param {Object[]} [policy.customUnits.rates] - Rates used in the policy.
+ * @param {Object} [policy.customUnits.attributes] - attributes on a custom unit
+ * @param {'mi' | 'km'} [policy.customUnits.attributes.unit] - unit of measurement for the distance
+ *
+ * @returns {Object|null} An object containing the rate and unit for the default mileage or null if not found.
+ * @returns {Number} .rate - The default rate for the mileage.
+ * @returns {String} .currency - The currency associated with the rate.
+ * @returns {String} .unit - The unit of measurement for the distance.
+ */
+const getDefaultMileageRate = (policy) => {
+    if (!policy || !policy.customUnits) {
+        return null;
+    }
+
+    const distanceUnit = _.find(_.values(policy.customUnits), (unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    if (!distanceUnit) {
+        return null;
+    }
+
+    const distanceRate = _.find(_.values(distanceUnit.rates), (rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+    if (!distanceRate) {
+        return null;
+    }
+
+    return {
+        rate: distanceRate.rate,
+        currency: distanceRate.currency,
+        unit: distanceUnit.attributes.unit,
+    };
+};
+
+/**
+ * Converts a given distance in meters to the specified unit (kilometers or miles).
+ *
+ * @param {Number} distanceInMeters - The distance in meters to be converted.
+ * @param {'mi' | 'km'} unit - The desired unit of conversion, either 'km' for kilometers or 'mi' for miles.
+ *
+ * @returns {Number} The converted distance in the specified unit.
+ */
+function convertDistanceUnit(distanceInMeters, unit) {
+    const METERS_TO_KM = 0.001; // 1 kilometer is 1000 meters
+    const METERS_TO_MILES = 0.000621371; // There are approximately 0.000621371 miles in a meter
+
+    switch (unit) {
+        case CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS:
+            return distanceInMeters * METERS_TO_KM;
+        case CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES:
+            return distanceInMeters * METERS_TO_MILES;
+        default:
+            throw new Error('Unsupported unit. Supported units are "mi" or "km".');
+    }
+}
+
+/**
+ *
+ * @param {Number} distanceInMeters Distance traveled
+ * @param {'mi' | 'km'} unit Unit that should be used to display the distance
+ * @returns {String} The distance in requested units, rounded to 2 decimals
+ */
+const getRoundedDistanceInUnits = (distanceInMeters, unit) => {
+    const convertedDistance = convertDistanceUnit(distanceInMeters, unit);
+    return convertedDistance.toFixed(2);
+};
+
+/**
+ *
+ * @param {boolean} hasRoute Whether the route exists for the distance request
+ * @param {Number} distanceInMeters Distance traveled
+ * @param {'mi' | 'km'} unit Unit that should be used to display the distance
+ * @param {Number} rate Expensable amount allowed per unit
+ * @param {String} currency The currency associated with the rate
+ * @param {Function} translate Translate function
+ * @returns {String} A string that describes the distance traveled and the rate used for expense calculation
+ */
+const getDistanceMerchant = (hasRoute, distanceInMeters, unit, rate, currency, translate) => {
+    const distanceInUnits = hasRoute ? getRoundedDistanceInUnits(distanceInMeters, unit) : translate('common.tbd');
+
+    const distanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.miles') : translate('common.kilometers');
+    const singularDistanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.mile') : translate('common.kilometer');
+    const unitString = distanceInUnits === 1 ? singularDistanceUnit : distanceUnit;
+
+    const ratePerUnit = rate * 0.01;
+    const currencySymbol = CurrencyUtils.getCurrencySymbol(currency) || `${currency} `;
+
+    return `${distanceInUnits} ${unitString} @ ${currencySymbol}${ratePerUnit} / ${singularDistanceUnit}`;
+};
+
+/**
+ * Calculates the request amount based on distance, unit, and rate.
+ *
+ * @param {Number} distance - The distance traveled in meters
+ * @param {'mi' | 'km'} unit - The unit of measurement for the distance
+ * @param {Number} rate - Rate used for calculating the request amount
+ * @returns {Number} The computed request amount.
+ */
+const getDistanceRequestAmount = (distance, unit, rate) => {
+    const convertedDistance = convertDistanceUnit(distance, unit);
+    const roundedDistance = convertedDistance.toFixed(2);
+    return roundedDistance * rate;
+};
+
+export default {getDefaultMileageRate, getDistanceMerchant, getDistanceRequestAmount};
diff --git a/src/libs/DomUtils/index.js b/src/libs/DomUtils/index.js
deleted file mode 100644
index ad636c6167fb..000000000000
--- a/src/libs/DomUtils/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function blurActiveElement() {
-    document.activeElement.blur();
-}
-
-function getActiveElement() {
-    return document.activeElement;
-}
-
-export default {
-    blurActiveElement,
-    getActiveElement,
-};
diff --git a/src/libs/DomUtils/index.native.js b/src/libs/DomUtils/index.native.js
deleted file mode 100644
index 1d3ef14c954d..000000000000
--- a/src/libs/DomUtils/index.native.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function blurActiveElement() {}
-
-function getActiveElement() {
-    return undefined;
-}
-
-export default {
-    blurActiveElement,
-    getActiveElement,
-};
diff --git a/src/libs/DomUtils/index.native.ts b/src/libs/DomUtils/index.native.ts
new file mode 100644
index 000000000000..d3774baec208
--- /dev/null
+++ b/src/libs/DomUtils/index.native.ts
@@ -0,0 +1,10 @@
+import {BlurActiveElement, GetActiveElement} from './types';
+
+const blurActiveElement: BlurActiveElement = () => {};
+
+const getActiveElement: GetActiveElement = () => null;
+
+export default {
+    blurActiveElement,
+    getActiveElement,
+};
diff --git a/src/libs/DomUtils/index.ts b/src/libs/DomUtils/index.ts
new file mode 100644
index 000000000000..784a01bd7885
--- /dev/null
+++ b/src/libs/DomUtils/index.ts
@@ -0,0 +1,18 @@
+import {BlurActiveElement, GetActiveElement} from './types';
+
+const blurActiveElement: BlurActiveElement = () => {
+    const activeElement = document.activeElement as HTMLElement;
+
+    if (!activeElement?.blur) {
+        return;
+    }
+
+    activeElement.blur();
+};
+
+const getActiveElement: GetActiveElement = () => document.activeElement;
+
+export default {
+    blurActiveElement,
+    getActiveElement,
+};
diff --git a/src/libs/DomUtils/types.ts b/src/libs/DomUtils/types.ts
new file mode 100644
index 000000000000..8be7b3cddae5
--- /dev/null
+++ b/src/libs/DomUtils/types.ts
@@ -0,0 +1,4 @@
+type BlurActiveElement = () => void;
+type GetActiveElement = () => Element | null;
+
+export type {BlurActiveElement, GetActiveElement};
diff --git a/src/libs/E2E/apiMocks/openApp.js b/src/libs/E2E/apiMocks/openApp.js
index 745c1952f07d..d50f4462cfd9 100644
--- a/src/libs/E2E/apiMocks/openApp.js
+++ b/src/libs/E2E/apiMocks/openApp.js
@@ -1094,7 +1094,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: 'qwerty',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1110,7 +1109,6 @@ export default () => ({
                     },
                     firstName: '"Chat N',
                     lastName: 'Laz"',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1126,7 +1124,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1142,7 +1139,6 @@ export default () => ({
                     },
                     firstName: '123',
                     lastName: 'Ios',
-                    payPalMeAddress: 'Wwerty',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1158,7 +1154,6 @@ export default () => ({
                     },
                     firstName: 'Qqq',
                     lastName: 'Qqq',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1174,7 +1169,6 @@ export default () => ({
                     },
                     firstName: 'Main',
                     lastName: 'Ios🏴󠁧󠁢󠁳󠁣󠁴󠁿ios',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1190,7 +1184,6 @@ export default () => ({
                     },
                     firstName: '0604',
                     lastName: 'Lsn',
-                    payPalMeAddress: '12345',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1206,7 +1199,6 @@ export default () => ({
                     },
                     firstName: '07 04 0704',
                     lastName: 'Lsn lsn',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1222,7 +1214,6 @@ export default () => ({
                     },
                     firstName: 'Katya',
                     lastName: 'Becciv',
-                    payPalMeAddress: 'testing',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1238,7 +1229,6 @@ export default () => ({
                     },
                     firstName: 'Katie',
                     lastName: 'Becciv',
-                    payPalMeAddress: 'kbecciv',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1254,7 +1244,6 @@ export default () => ({
                     },
                     firstName: '11',
                     lastName: '11',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1270,7 +1259,6 @@ export default () => ({
                     },
                     firstName: '"First"',
                     lastName: '',
-                    payPalMeAddress: '444555',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1286,7 +1274,6 @@ export default () => ({
                     },
                     firstName: 'bernardo',
                     lastName: 'utest',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: false,
                 },
@@ -1302,7 +1289,6 @@ export default () => ({
                     },
                     firstName: 'Chat',
                     lastName: 'HT',
-                    payPalMeAddress: '111',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1318,7 +1304,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1334,7 +1319,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1350,7 +1334,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                     localCurrencyCode: 'USD',
@@ -1367,7 +1350,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1383,7 +1365,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1399,7 +1380,6 @@ export default () => ({
                     },
                     firstName: 'Applause',
                     lastName: 'Main Account',
-                    payPalMeAddress: 'ss',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1415,7 +1395,6 @@ export default () => ({
                     },
                     firstName: 'Christoph',
                     lastName: 'Pader',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1431,7 +1410,6 @@ export default () => ({
                     },
                     firstName: 'Concierge',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1447,7 +1425,6 @@ export default () => ({
                     },
                     firstName: 'Chat S',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1463,7 +1440,6 @@ export default () => ({
                     },
                     firstName: 'Tayla',
                     lastName: 'Simmons',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -2162,7 +2138,6 @@ export default () => ({
                     cachedTotal: '($1,473.11)',
                     total: 147311,
                     stateNum: 1,
-                    submitterPayPalMeAddress: '',
                     hasOutstandingIOU: true,
                 },
                 report_4249286573496381: {
@@ -2175,7 +2150,6 @@ export default () => ({
                     cachedTotal: '($212.78)',
                     total: 21278,
                     stateNum: 1,
-                    submitterPayPalMeAddress: '',
                     hasOutstandingIOU: true,
                 },
             },
diff --git a/src/libs/EmojiTrie.js b/src/libs/EmojiTrie.js
index c5448c340d81..00e5fc1388e1 100644
--- a/src/libs/EmojiTrie.js
+++ b/src/libs/EmojiTrie.js
@@ -8,6 +8,41 @@ Timing.start(CONST.TIMING.TRIE_INITIALIZATION);
 
 const supportedLanguages = [CONST.LOCALES.DEFAULT, CONST.LOCALES.ES];
 
+/**
+ *
+ * @param {Trie} trie The Trie object.
+ * @param {Array<String>} keywords An array containing the keywords.
+ * @param {Object} item An object containing the properties of the emoji.
+ * @param {String} name The localized name of the emoji.
+ * @param {Boolean} shouldPrependKeyword Prepend the keyword (instead of append) to the suggestions
+ */
+function addKeywordsToTrie(trie, keywords, item, name, shouldPrependKeyword = false) {
+    _.forEach(keywords, (keyword) => {
+        const keywordNode = trie.search(keyword);
+        if (!keywordNode) {
+            trie.add(keyword, {suggestions: [{code: item.code, types: item.types, name}]});
+        } else {
+            const suggestion = {code: item.code, types: item.types, name};
+            const suggestions = shouldPrependKeyword ? [suggestion, ...keywordNode.metaData.suggestions] : [...keywordNode.metaData.suggestions, suggestion];
+            trie.update(keyword, {
+                ...keywordNode.metaData,
+                suggestions,
+            });
+        }
+    });
+}
+
+/**
+ * Allows searching based on parts of the name. This turns 'white_large_square' into ['white_large_square', 'large_square', 'square'].
+ *
+ * @param {String} name The emoji name
+ * @returns {Array<String>} An array containing the name parts
+ */
+function getNameParts(name) {
+    const nameSplit = name.split('_');
+    return _.map(nameSplit, (_namePart, index) => nameSplit.slice(index).join('_'));
+}
+
 function createTrie(lang = CONST.LOCALES.DEFAULT) {
     const trie = new Trie();
     const langEmojis = localeEmojis[lang];
@@ -18,28 +53,30 @@ function createTrie(lang = CONST.LOCALES.DEFAULT) {
             return;
         }
 
-        const name = isDefaultLocale ? item.name : _.get(langEmojis, [item.code, 'name']);
-        const names = isDefaultLocale ? [name] : [...new Set([name, item.name])];
-        _.forEach(names, (nm) => {
-            const node = trie.search(nm);
-            if (!node) {
-                trie.add(nm, {code: item.code, types: item.types, name: nm, suggestions: []});
-            } else {
-                trie.update(nm, {code: item.code, types: item.types, name: nm, suggestions: node.metaData.suggestions});
-            }
-        });
+        const englishName = item.name;
+        const localeName = _.get(langEmojis, [item.code, 'name'], englishName);
+
+        const node = trie.search(localeName);
+        if (!node) {
+            trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});
+        } else {
+            trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});
+        }
 
+        const nameParts = getNameParts(localeName).slice(1); // We remove the first part because we already index the full name.
+        addKeywordsToTrie(trie, nameParts, item, localeName);
+
+        // Add keywords for both the locale language and English to enable users to search using either language.
         const keywords = _.get(langEmojis, [item.code, 'keywords'], []).concat(isDefaultLocale ? [] : _.get(localeEmojis, [CONST.LOCALES.DEFAULT, item.code, 'keywords'], []));
-        for (let j = 0; j < keywords.length; j++) {
-            const keywordNode = trie.search(keywords[j]);
-            if (!keywordNode) {
-                trie.add(keywords[j], {suggestions: [{code: item.code, types: item.types, name}]});
-            } else {
-                trie.update(keywords[j], {
-                    ...keywordNode.metaData,
-                    suggestions: [...keywordNode.metaData.suggestions, {code: item.code, types: item.types, name}],
-                });
-            }
+        addKeywordsToTrie(trie, keywords, item, localeName);
+
+        /**
+         * If current language isn't the default, prepend the English name of the emoji in the suggestions as well.
+         * We do this because when the user types the english name of the emoji, we want to show the emoji in the suggestions before all the others.
+         */
+        if (!isDefaultLocale) {
+            const englishNameParts = getNameParts(englishName);
+            addKeywordsToTrie(trie, englishNameParts, item, localeName, true);
         }
     });
 
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index df00418b7524..80665541e24b 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -319,7 +319,16 @@ function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
     }
     for (let i = 0; i < emojiData.length; i++) {
         const name = emojiData[i].slice(1, -1);
-        const checkEmoji = trie.search(name);
+        let checkEmoji = trie.search(name);
+        // If the user has selected a language other than English, and the emoji doesn't exist in that language,
+        // we will check if the emoji exists in English.
+        if (lang !== CONST.LOCALES.DEFAULT && (!checkEmoji || !checkEmoji.metaData.code)) {
+            const englishTrie = emojisTrie[CONST.LOCALES.DEFAULT];
+            if (englishTrie) {
+                const englishEmoji = englishTrie.search(name);
+                checkEmoji = englishEmoji;
+            }
+        }
         if (checkEmoji && checkEmoji.metaData.code) {
             let emojiReplacement = getEmojiCodeWithSkinColor(checkEmoji.metaData, preferredSkinTone);
             emojis.push({
diff --git a/src/libs/Errors/HttpsError.js b/src/libs/Errors/HttpsError.ts
similarity index 59%
rename from src/libs/Errors/HttpsError.js
rename to src/libs/Errors/HttpsError.ts
index 8d137f8d50cf..2c5f3836a360 100644
--- a/src/libs/Errors/HttpsError.js
+++ b/src/libs/Errors/HttpsError.ts
@@ -1,8 +1,16 @@
+type HttpsErrorArguments = {message: string; status?: string; title?: string};
+
 /**
  * Custom error class useful for re-throwing fetch errors with status code or valid error responses with status 200 but non 200 jsonCode
  */
 export default class HttpsError extends Error {
-    constructor({message, status = '', title = ''}) {
+    name: string;
+
+    status: string;
+
+    title: string;
+
+    constructor({message, status = '', title = ''}: HttpsErrorArguments) {
         super(message);
         this.name = 'HttpsError';
         this.status = status;
diff --git a/src/libs/GetStyledTextArray.js b/src/libs/GetStyledTextArray.ts
similarity index 86%
rename from src/libs/GetStyledTextArray.js
rename to src/libs/GetStyledTextArray.ts
index 576e6f98c94b..cdcedbac2a4f 100644
--- a/src/libs/GetStyledTextArray.js
+++ b/src/libs/GetStyledTextArray.ts
@@ -1,12 +1,11 @@
 import Str from 'expensify-common/lib/str';
 
-/**
- * Render a suggestion menu item component.
- * @param {String} name
- * @param {String} prefix
- * @returns {Array}
- */
-const getStyledTextArray = (name, prefix) => {
+type StyledText = {
+    text: string;
+    isColored: boolean;
+};
+
+const getStyledTextArray = (name: string, prefix: string): StyledText[] => {
     const texts = [];
     const prefixLowercase = prefix.toLowerCase();
     const prefixLocation = name.toLowerCase().search(Str.escapeForRegExp(prefixLowercase));
diff --git a/src/libs/GooglePlacesUtils.js b/src/libs/GooglePlacesUtils.js
deleted file mode 100644
index 8723598264fb..000000000000
--- a/src/libs/GooglePlacesUtils.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ from 'underscore';
-
-/**
- * Finds an address component by type, and returns the value associated to key. Each address component object
- * inside the addressComponents array has the following structure:
- * [{
- *   long_name: "New York",
- *   short_name: "New York",
- *   types: [ "locality", "political" ]
- * }]
- *
- * @param {Array} addressComponents
- * @param {Object} fieldsToExtract – has shape: {addressType: 'keyToUse'}
- * @returns {Object}
- */
-function getAddressComponents(addressComponents, fieldsToExtract) {
-    const result = _.mapObject(fieldsToExtract, () => '');
-    _.each(addressComponents, (addressComponent) => {
-        _.each(addressComponent.types, (addressType) => {
-            if (!_.has(fieldsToExtract, addressType) || !_.isEmpty(result[addressType])) {
-                return;
-            }
-            const value = addressComponent[fieldsToExtract[addressType]] ? addressComponent[fieldsToExtract[addressType]] : '';
-            result[addressType] = value;
-        });
-    });
-    return result;
-}
-
-/**
- * Finds an address term by type, and returns the value associated to key. Note that each term in the address must
- * conform to the following ORDER: <street, city, state, country>
- *
- * @param {Array} addressTerms
- * @returns {Object}
- */
-function getPlaceAutocompleteTerms(addressTerms) {
-    const fieldsToExtract = ['country', 'state', 'city', 'street'];
-    const result = {};
-    _.each(fieldsToExtract, (fieldToExtract, index) => {
-        const fieldTermIndex = addressTerms.length - (index + 1);
-        result[fieldToExtract] = fieldTermIndex >= 0 ? addressTerms[fieldTermIndex].value : '';
-    });
-    return result;
-}
-
-export {
-    // eslint-disable-next-line import/prefer-default-export
-    getAddressComponents,
-    getPlaceAutocompleteTerms,
-};
diff --git a/src/libs/GooglePlacesUtils.ts b/src/libs/GooglePlacesUtils.ts
new file mode 100644
index 000000000000..43fac2b9a785
--- /dev/null
+++ b/src/libs/GooglePlacesUtils.ts
@@ -0,0 +1,53 @@
+type AddressComponent = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    long_name: string;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    short_name: string;
+    types: string[];
+};
+type FieldsToExtract = Record<string, Exclude<keyof AddressComponent, 'types'>>;
+
+/**
+ * Finds an address component by type, and returns the value associated to key. Each address component object
+ * inside the addressComponents array has the following structure:
+ * [{
+ *   long_name: "New York",
+ *   short_name: "New York",
+ *   types: [ "locality", "political" ]
+ * }]
+ */
+function getAddressComponents(addressComponents: AddressComponent[], fieldsToExtract: FieldsToExtract): Record<string, string> {
+    const result: Record<string, string> = {};
+    Object.keys(fieldsToExtract).forEach((key) => (result[key] = ''));
+
+    addressComponents.forEach((addressComponent) => {
+        addressComponent.types.forEach((addressType) => {
+            if (!(addressType in fieldsToExtract) || !(addressType in result && result[addressType] === '')) {
+                return;
+            }
+            const value = addressComponent[fieldsToExtract[addressType]] ? addressComponent[fieldsToExtract[addressType]] : '';
+            result[addressType] = value;
+        });
+    });
+    return result;
+}
+
+type AddressTerm = {value: string};
+type GetPlaceAutocompleteTermsResultKey = 'country' | 'state' | 'city' | 'street';
+type GetPlaceAutocompleteTermsResult = Partial<Record<GetPlaceAutocompleteTermsResultKey, string>>;
+
+/**
+ * Finds an address term by type, and returns the value associated to key. Note that each term in the address must
+ * conform to the following ORDER: <street, city, state, country>
+ */
+function getPlaceAutocompleteTerms(addressTerms: AddressTerm[]): GetPlaceAutocompleteTermsResult {
+    const fieldsToExtract: GetPlaceAutocompleteTermsResultKey[] = ['country', 'state', 'city', 'street'];
+    const result: GetPlaceAutocompleteTermsResult = {};
+    fieldsToExtract.forEach((fieldToExtract, index) => {
+        const fieldTermIndex = addressTerms.length - (index + 1);
+        result[fieldToExtract] = fieldTermIndex >= 0 ? addressTerms[fieldTermIndex].value : '';
+    });
+    return result;
+}
+
+export {getAddressComponents, getPlaceAutocompleteTerms};
diff --git a/src/libs/Growl.js b/src/libs/Growl.js
deleted file mode 100644
index 81994dd4c255..000000000000
--- a/src/libs/Growl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import CONST from '../CONST';
-
-const growlRef = React.createRef();
-let resolveIsReadyPromise;
-const isReadyPromise = new Promise((resolve) => {
-    resolveIsReadyPromise = resolve;
-});
-
-function setIsReady() {
-    resolveIsReadyPromise();
-}
-
-/**
- * Show the growl notification
- *
- * @param {String} bodyText
- * @param {String} type
- * @param {Number} [duration]
- */
-function show(bodyText, type, duration = CONST.GROWL.DURATION) {
-    isReadyPromise.then(() => growlRef.current.show(bodyText, type, duration));
-}
-
-/**
- * Show error growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function error(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.ERROR, duration);
-}
-
-/**
- * Show success growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function success(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.SUCCESS, duration);
-}
-
-export default {
-    show,
-    error,
-    success,
-};
-
-export {growlRef, setIsReady};
diff --git a/src/libs/Growl.ts b/src/libs/Growl.ts
new file mode 100644
index 000000000000..99c728f0a210
--- /dev/null
+++ b/src/libs/Growl.ts
@@ -0,0 +1,49 @@
+import React from 'react';
+import CONST from '../CONST';
+
+type GrowlRef = {
+    show?: (bodyText: string, type: string, duration: number) => void;
+};
+
+const growlRef = React.createRef<GrowlRef>();
+let resolveIsReadyPromise: undefined | ((value?: unknown) => void);
+const isReadyPromise = new Promise((resolve) => {
+    resolveIsReadyPromise = resolve;
+});
+
+function setIsReady() {
+    if (!resolveIsReadyPromise) return;
+    resolveIsReadyPromise();
+}
+
+/**
+ * Show the growl notification
+ */
+function show(bodyText: string, type: string, duration: number = CONST.GROWL.DURATION) {
+    isReadyPromise.then(() => {
+        if (!growlRef?.current?.show) return;
+        growlRef.current.show(bodyText, type, duration);
+    });
+}
+
+/**
+ * Show error growl
+ */
+function error(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.ERROR, duration);
+}
+
+/**
+ * Show success growl
+ */
+function success(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.SUCCESS, duration);
+}
+
+export default {
+    show,
+    error,
+    success,
+};
+
+export {growlRef, setIsReady};
diff --git a/src/libs/HapticFeedback/index.native.js b/src/libs/HapticFeedback/index.native.js
deleted file mode 100644
index bc57c74d8d04..000000000000
--- a/src/libs/HapticFeedback/index.native.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
-
-function press() {
-    ReactNativeHapticFeedback.trigger('impactLight', {
-        enableVibrateFallback: true,
-    });
-}
-
-function longPress() {
-    ReactNativeHapticFeedback.trigger('impactHeavy', {
-        enableVibrateFallback: true,
-    });
-}
-
-function success() {
-    ReactNativeHapticFeedback.trigger('notificationSuccess', {
-        enableVibrateFallback: true,
-    });
-}
-
-function error() {
-    ReactNativeHapticFeedback.trigger('notificationError', {
-        enableVibrateFallback: true,
-    });
-}
-
-export default {
-    press,
-    longPress,
-    success,
-    error,
-};
diff --git a/src/libs/HapticFeedback/index.native.ts b/src/libs/HapticFeedback/index.native.ts
new file mode 100644
index 000000000000..4c3605cc27ef
--- /dev/null
+++ b/src/libs/HapticFeedback/index.native.ts
@@ -0,0 +1,27 @@
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
+import HapticFeedback from './types';
+
+const hapticFeedback: HapticFeedback = {
+    press: () => {
+        ReactNativeHapticFeedback.trigger('impactLight', {
+            enableVibrateFallback: true,
+        });
+    },
+    longPress: () => {
+        ReactNativeHapticFeedback.trigger('impactHeavy', {
+            enableVibrateFallback: true,
+        });
+    },
+    success: () => {
+        ReactNativeHapticFeedback.trigger('notificationSuccess', {
+            enableVibrateFallback: true,
+        });
+    },
+    error: () => {
+        ReactNativeHapticFeedback.trigger('notificationError', {
+            enableVibrateFallback: true,
+        });
+    },
+};
+
+export default hapticFeedback;
diff --git a/src/libs/HapticFeedback/index.js b/src/libs/HapticFeedback/index.ts
similarity index 55%
rename from src/libs/HapticFeedback/index.js
rename to src/libs/HapticFeedback/index.ts
index cef9f994ddaf..3dd5b87f573b 100644
--- a/src/libs/HapticFeedback/index.js
+++ b/src/libs/HapticFeedback/index.ts
@@ -1,9 +1,13 @@
+import HapticFeedback from './types';
+
 /**
  * Web does not support Haptic feedback
  */
-export default {
+const hapticFeedback: HapticFeedback = {
     press: () => {},
     longPress: () => {},
     success: () => {},
     error: () => {},
 };
+
+export default hapticFeedback;
diff --git a/src/libs/HapticFeedback/types.ts b/src/libs/HapticFeedback/types.ts
new file mode 100644
index 000000000000..3db056fad148
--- /dev/null
+++ b/src/libs/HapticFeedback/types.ts
@@ -0,0 +1,8 @@
+type HapticFeedback = {
+    press: () => void;
+    longPress: () => void;
+    success: () => void;
+    error: () => void;
+};
+
+export default HapticFeedback;
diff --git a/src/libs/IntlPolyfill/index.js b/src/libs/IntlPolyfill/index.js
index 3925b98729a9..a99fc4cfed44 100644
--- a/src/libs/IntlPolyfill/index.js
+++ b/src/libs/IntlPolyfill/index.js
@@ -7,4 +7,5 @@ import polyfillNumberFormat from './polyfillNumberFormat';
 export default function intlPolyfill() {
     // Just need to polyfill Intl.NumberFormat for web based platforms
     polyfillNumberFormat();
+    require('@formatjs/intl-datetimeformat');
 }
diff --git a/src/libs/IntlPolyfill/index.native.js b/src/libs/IntlPolyfill/index.native.js
index a628654fefea..4fb5ca585e25 100644
--- a/src/libs/IntlPolyfill/index.native.js
+++ b/src/libs/IntlPolyfill/index.native.js
@@ -9,6 +9,7 @@ export default function polyfill() {
     require('@formatjs/intl-getcanonicallocales/polyfill');
     require('@formatjs/intl-locale/polyfill');
     require('@formatjs/intl-pluralrules/polyfill');
+    require('@formatjs/intl-datetimeformat');
     polyfillNumberFormat();
     polyfillListFormat();
 }
diff --git a/src/libs/LocaleDigitUtils.js b/src/libs/LocaleDigitUtils.ts
similarity index 68%
rename from src/libs/LocaleDigitUtils.js
rename to src/libs/LocaleDigitUtils.ts
index 23396f8d2fb6..e17620aa5427 100644
--- a/src/libs/LocaleDigitUtils.js
+++ b/src/libs/LocaleDigitUtils.ts
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import _ from 'lodash';
 
 import * as NumberFormatUtils from './NumberFormatUtils';
 
@@ -8,12 +8,12 @@ const INDEX_DECIMAL = 10;
 const INDEX_MINUS_SIGN = 11;
 const INDEX_GROUP = 12;
 
-const getLocaleDigits = _.memoize((locale) => {
-    const localeDigits = _.clone(STANDARD_DIGITS);
+const getLocaleDigits = _.memoize((locale: string): string[] => {
+    const localeDigits = [...STANDARD_DIGITS];
     for (let i = 0; i <= 9; i++) {
         localeDigits[i] = NumberFormatUtils.format(locale, i);
     }
-    _.forEach(NumberFormatUtils.formatToParts(locale, 1000000.5), (part) => {
+    NumberFormatUtils.formatToParts(locale, 1000000.5).forEach((part) => {
         switch (part.type) {
             case 'decimal':
                 localeDigits[INDEX_DECIMAL] = part.value;
@@ -34,15 +34,13 @@ const getLocaleDigits = _.memoize((locale) => {
 /**
  * Gets the locale digit corresponding to a standard digit.
  *
- * @param {String} locale
- * @param {String} digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
+ * @param digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
  * "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `digit` is not a valid standard digit.
  */
-function toLocaleDigit(locale, digit) {
-    const index = _.indexOf(STANDARD_DIGITS, digit);
+function toLocaleDigit(locale: string, digit: string): string {
+    const index = STANDARD_DIGITS.indexOf(digit);
     if (index < 0) {
         throw new Error(`"${digit}" must be in ${JSON.stringify(STANDARD_DIGITS)}`);
     }
@@ -52,15 +50,13 @@ function toLocaleDigit(locale, digit) {
 /**
  * Gets the standard digit corresponding to a locale digit.
  *
- * @param {String} locale
- * @param {String} localeDigit - Character of a single locale digit. It may be **the localized version** of
+ * @param localeDigit - Character of a single locale digit. It may be **the localized version** of
  * "0" ~ "9" (digits), "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `localeDigit` is not a valid locale digit.
  */
-function fromLocaleDigit(locale, localeDigit) {
-    const index = _.indexOf(getLocaleDigits(locale), localeDigit);
+function fromLocaleDigit(locale: string, localeDigit: string): string {
+    const index = getLocaleDigits(locale).indexOf(localeDigit);
     if (index < 0) {
         throw new Error(`"${localeDigit}" must be in ${JSON.stringify(getLocaleDigits(locale))}`);
     }
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.ts
similarity index 82%
rename from src/libs/LocalePhoneNumber.js
rename to src/libs/LocalePhoneNumber.ts
index e5c7cbfa45ba..962040aee049 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.ts
@@ -3,20 +3,17 @@ import Str from 'expensify-common/lib/str';
 import {parsePhoneNumber} from 'awesome-phonenumber';
 import ONYXKEYS from '../ONYXKEYS';
 
-let countryCodeByIP;
+let countryCodeByIP: number;
 Onyx.connect({
     key: ONYXKEYS.COUNTRY_CODE,
-    callback: (val) => (countryCodeByIP = val || 1),
+    callback: (val) => (countryCodeByIP = val ?? 1),
 });
 
 /**
  * Returns a locally converted phone number for numbers from the same region
  * and an internationally converted phone number with the country code for numbers from other regions
- *
- * @param {String} number
- * @returns {String}
  */
-function formatPhoneNumber(number) {
+function formatPhoneNumber(number: string): string {
     if (!number) {
         return '';
     }
@@ -26,7 +23,7 @@ function formatPhoneNumber(number) {
 
     // return the string untouched if it's not a phone number
     if (!parsedPhoneNumber.valid) {
-        if (parsedPhoneNumber.number && parsedPhoneNumber.number.international) {
+        if (parsedPhoneNumber.number?.international) {
             return parsedPhoneNumber.number.international;
         }
         return numberWithoutSMSDomain;
diff --git a/src/libs/Localize/index.js b/src/libs/Localize/index.js
index 9878873377b8..db371301f43f 100644
--- a/src/libs/Localize/index.js
+++ b/src/libs/Localize/index.js
@@ -38,7 +38,7 @@ function init() {
  * Return translated string for given locale and phrase
  *
  * @param {String} [desiredLanguage] eg 'en', 'es-ES'
- * @param {String|Array} phraseKey
+ * @param {String} phraseKey
  * @param {Object} [phraseParameters] Parameters to supply if the phrase is a template literal.
  * @returns {String}
  */
@@ -47,15 +47,15 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     let translatedPhrase;
 
     // Search phrase in full locale e.g. es-ES
-    const desiredLanguageDictionary = lodashGet(translations, desiredLanguage);
-    translatedPhrase = lodashGet(desiredLanguageDictionary, phraseKey);
+    const desiredLanguageDictionary = translations[desiredLanguage] || {};
+    translatedPhrase = desiredLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
 
     // Phrase is not found in full locale, search it in fallback language e.g. es
-    const fallbackLanguageDictionary = lodashGet(translations, languageAbbreviation);
-    translatedPhrase = lodashGet(fallbackLanguageDictionary, phraseKey);
+    const fallbackLanguageDictionary = translations[languageAbbreviation] || {};
+    translatedPhrase = fallbackLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
@@ -64,8 +64,8 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     }
 
     // Phrase is not translated, search it in default language (en)
-    const defaultLanguageDictionary = lodashGet(translations, CONST.LOCALES.DEFAULT, {});
-    translatedPhrase = lodashGet(defaultLanguageDictionary, phraseKey);
+    const defaultLanguageDictionary = translations[CONST.LOCALES.DEFAULT] || {};
+    translatedPhrase = defaultLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
diff --git a/src/libs/Metrics/index.js b/src/libs/Metrics/index.js
deleted file mode 100644
index 2c90f1c51b65..000000000000
--- a/src/libs/Metrics/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import CONFIG from '../../CONFIG';
-
-// We don't capture performance metrics on web as there are enough tools available
-const canCapturePerformanceMetrics = () => false;
-
-const canCaptureOnyxMetrics = () => Boolean(CONFIG.ONYX_METRICS);
-
-export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.native.js b/src/libs/Metrics/index.native.js
deleted file mode 100644
index f57526e674ba..000000000000
--- a/src/libs/Metrics/index.native.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import CONFIG from '../../CONFIG';
-
-/**
- * Is capturing performance stats enabled.
- *
- * @returns {Boolean}
- */
-const canCapturePerformanceMetrics = () => CONFIG.CAPTURE_METRICS;
-
-/**
- * Is capturing Onyx stats enabled.
- *
- * @returns {Boolean}
- */
-const canCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
-
-export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.native.ts b/src/libs/Metrics/index.native.ts
new file mode 100644
index 000000000000..526e5c57a269
--- /dev/null
+++ b/src/libs/Metrics/index.native.ts
@@ -0,0 +1,14 @@
+import CONFIG from '../../CONFIG';
+import {CanCaptureOnyxMetrics, CanCapturePerformanceMetrics} from './types';
+
+/**
+ * Is capturing performance stats enabled.
+ */
+const canCapturePerformanceMetrics: CanCapturePerformanceMetrics = () => CONFIG.CAPTURE_METRICS;
+
+/**
+ * Is capturing Onyx stats enabled.
+ */
+const canCaptureOnyxMetrics: CanCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
+
+export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.ts b/src/libs/Metrics/index.ts
new file mode 100644
index 000000000000..7c33f31cb19e
--- /dev/null
+++ b/src/libs/Metrics/index.ts
@@ -0,0 +1,9 @@
+import CONFIG from '../../CONFIG';
+import {CanCaptureOnyxMetrics, CanCapturePerformanceMetrics} from './types';
+
+// We don't capture performance metrics on web as there are enough tools available
+const canCapturePerformanceMetrics: CanCapturePerformanceMetrics = () => false;
+
+const canCaptureOnyxMetrics: CanCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
+
+export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/types.ts b/src/libs/Metrics/types.ts
new file mode 100644
index 000000000000..61b1400ae9f8
--- /dev/null
+++ b/src/libs/Metrics/types.ts
@@ -0,0 +1,4 @@
+type CanCapturePerformanceMetrics = () => boolean;
+type CanCaptureOnyxMetrics = () => boolean;
+
+export type {CanCapturePerformanceMetrics, CanCaptureOnyxMetrics};
diff --git a/src/libs/Middleware/SaveResponseInOnyx.js b/src/libs/Middleware/SaveResponseInOnyx.js
index 28b8a93fb585..8cb66c0c10d0 100644
--- a/src/libs/Middleware/SaveResponseInOnyx.js
+++ b/src/libs/Middleware/SaveResponseInOnyx.js
@@ -1,34 +1,32 @@
-import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
-import * as QueuedOnyxUpdates from '../actions/QueuedOnyxUpdates';
 import * as MemoryOnlyKeys from '../actions/MemoryOnlyKeys/MemoryOnlyKeys';
 import * as OnyxUpdates from '../actions/OnyxUpdates';
 
+// If we're executing any of these requests, we don't need to trigger our OnyxUpdates flow to update the current data even if our current value is out of
+// date because all these requests are updating the app to the most current state.
+const requestsToIgnoreLastUpdateID = ['OpenApp', 'ReconnectApp', 'GetMissingOnyxMessages'];
+
 /**
- * @param {Promise} response
+ * @param {Promise} requestResponse
  * @param {Object} request
  * @returns {Promise}
  */
-function SaveResponseInOnyx(response, request) {
-    return response.then((responseData) => {
-        // Make sure we have response data (i.e. response isn't a promise being passed down to us by a failed retry request and responseData undefined)
-        if (!responseData) {
+function SaveResponseInOnyx(requestResponse, request) {
+    return requestResponse.then((response) => {
+        // Make sure we have response data (i.e. response isn't a promise being passed down to us by a failed retry request and response undefined)
+        if (!response) {
             return;
         }
+        const onyxUpdates = response.onyxData;
 
-        // The data for this response comes in two different formats:
-        // 1. Original format - this is what was sent before the RELIABLE_UPDATES project and will go away once RELIABLE_UPDATES is fully complete
-        //     - The data is an array of objects, where each object is an onyx update
-        //       Example: [{onyxMethod: 'whatever', key: 'foo', value: 'bar'}]
-        // 1. Reliable updates format - this is what was sent with the RELIABLE_UPDATES project and will be the format from now on
-        //     - The data is an object, containing updateIDs from the server and an array of onyx updates (this array is the same format as the original format above)
-        //       Example: {lastUpdateID: 1, previousUpdateID: 0, onyxData: [{onyxMethod: 'whatever', key: 'foo', value: 'bar'}]}
-        //       NOTE: This is slightly different than the format of the pusher event data, where pusher has "updates" and HTTPS responses have "onyxData" (long story)
+        // Sometimes we call requests that are successfull but they don't have any response or any success/failure data to set. Let's return early since
+        // we don't need to store anything here.
+        if (!onyxUpdates && !request.successData && !request.failureData) {
+            return Promise.resolve(response);
+        }
 
-        // Supports both the old format and the new format
-        const onyxUpdates = _.isArray(responseData) ? responseData : responseData.onyxData;
         // If there is an OnyxUpdate for using memory only keys, enable them
         _.find(onyxUpdates, ({key, value}) => {
             if (key !== ONYXKEYS.IS_USING_MEMORY_ONLY_KEYS || !value) {
@@ -39,30 +37,26 @@ function SaveResponseInOnyx(response, request) {
             return true;
         });
 
-        // Save the update IDs to Onyx so they can be used to fetch incremental updates if the client gets out of sync from the server
-        OnyxUpdates.saveUpdateIDs(Number(responseData.lastUpdateID || 0), Number(responseData.previousUpdateID || 0));
+        const responseToApply = {
+            type: CONST.ONYX_UPDATE_TYPES.HTTPS,
+            lastUpdateID: Number(response.lastUpdateID || 0),
+            previousUpdateID: Number(response.previousUpdateID || 0),
+            request,
+            response,
+        };
 
-        // For most requests we can immediately update Onyx. For write requests we queue the updates and apply them after the sequential queue has flushed to prevent a replay effect in
-        // the UI. See https://github.com/Expensify/App/issues/12775 for more info.
-        const updateHandler = request.data.apiRequestType === CONST.API_REQUEST_TYPE.WRITE ? QueuedOnyxUpdates.queueOnyxUpdates : Onyx.update;
+        if (_.includes(requestsToIgnoreLastUpdateID, request.command) || !OnyxUpdates.doesClientNeedToBeUpdated(Number(response.previousUpdateID || 0))) {
+            return OnyxUpdates.apply(responseToApply);
+        }
 
-        // First apply any onyx data updates that are being sent back from the API. We wait for this to complete and then
-        // apply successData or failureData. This ensures that we do not update any pending, loading, or other UI states contained
-        // in successData/failureData until after the component has received and API data.
-        const onyxDataUpdatePromise = responseData.onyxData ? updateHandler(responseData.onyxData) : Promise.resolve();
+        // Save the update IDs to Onyx so they can be used to fetch incremental updates if the client gets out of sync from the server
+        OnyxUpdates.saveUpdateInformation(responseToApply);
 
-        return onyxDataUpdatePromise
-            .then(() => {
-                // Handle the request's success/failure data (client-side data)
-                if (responseData.jsonCode === 200 && request.successData) {
-                    return updateHandler(request.successData);
-                }
-                if (responseData.jsonCode !== 200 && request.failureData) {
-                    return updateHandler(request.failureData);
-                }
-                return Promise.resolve();
-            })
-            .then(() => responseData);
+        // Ensure the queue is paused while the client resolves the gap in onyx updates so that updates are guaranteed to happen in a specific order.
+        return Promise.resolve({
+            ...response,
+            shouldPauseQueue: true,
+        });
     });
 }
 
diff --git a/src/libs/MoneyRequestUtils.js b/src/libs/MoneyRequestUtils.js
index 706c34ad912d..e60eae0cdfe5 100644
--- a/src/libs/MoneyRequestUtils.js
+++ b/src/libs/MoneyRequestUtils.js
@@ -82,4 +82,15 @@ function replaceAllDigits(text, convertFn) {
         .value();
 }
 
-export {stripCommaFromAmount, stripSpacesFromAmount, addLeadingZero, validateAmount, replaceAllDigits};
+/**
+ * Check if distance request or not
+ *
+ * @param {String} iouType - `send` | `split` | `request`
+ * @param {String} selectedTab - `manual` | `scan` | `distance`
+ * @returns {Boolean}
+ */
+function isDistanceRequest(iouType, selectedTab) {
+    return iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST && selectedTab === CONST.TAB.DISTANCE;
+}
+
+export {stripCommaFromAmount, stripSpacesFromAmount, addLeadingZero, validateAmount, replaceAllDigits, isDistanceRequest};
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 795c5bace1b6..e0197805f09c 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import Onyx, {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import moment from 'moment';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
@@ -35,6 +34,7 @@ import styles from '../../../styles/styles';
 import * as SessionUtils from '../../SessionUtils';
 import NotFoundPage from '../../../pages/ErrorPage/NotFoundPage';
 import getRootNavigatorScreenOptions from './getRootNavigatorScreenOptions';
+import DemoSetupPage from '../../../pages/DemoSetupPage';
 
 let timezone;
 let currentAccountID;
@@ -64,7 +64,7 @@ Onyx.connect({
         }
 
         timezone = lodashGet(val, [currentAccountID, 'timezone'], {});
-        const currentTimezone = moment.tz.guess(true);
+        const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic
         // then update their timezone.
@@ -159,7 +159,7 @@ class AuthScreens extends React.Component {
         Timing.end(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
 
         const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH;
-        const groupShortcutConfig = CONST.KEYBOARD_SHORTCUTS.NEW_GROUP;
+        const chatShortcutConfig = CONST.KEYBOARD_SHORTCUTS.NEW_CHAT;
 
         // Listen for the key K being pressed so that focus can be given to
         // the chat switcher, or new group chat
@@ -178,18 +178,18 @@ class AuthScreens extends React.Component {
             searchShortcutConfig.modifiers,
             true,
         );
-        this.unsubscribeGroupShortcut = KeyboardShortcut.subscribe(
-            groupShortcutConfig.shortcutKey,
+        this.unsubscribeChatShortcut = KeyboardShortcut.subscribe(
+            chatShortcutConfig.shortcutKey,
             () => {
                 Modal.close(() => {
-                    if (Navigation.isActiveRoute(ROUTES.NEW_GROUP)) {
+                    if (Navigation.isActiveRoute(ROUTES.NEW_CHAT)) {
                         return;
                     }
-                    Navigation.navigate(ROUTES.NEW_GROUP);
+                    Navigation.navigate(ROUTES.NEW_CHAT);
                 });
             },
-            groupShortcutConfig.descriptionKey,
-            groupShortcutConfig.modifiers,
+            chatShortcutConfig.descriptionKey,
+            chatShortcutConfig.modifiers,
             true,
         );
     }
@@ -202,8 +202,8 @@ class AuthScreens extends React.Component {
         if (this.unsubscribeSearchShortcut) {
             this.unsubscribeSearchShortcut();
         }
-        if (this.unsubscribeGroupShortcut) {
-            this.unsubscribeGroupShortcut();
+        if (this.unsubscribeChatShortcut) {
+            this.unsubscribeChatShortcut();
         }
         Session.cleanupSession();
         clearInterval(this.interval);
@@ -240,6 +240,7 @@ class AuthScreens extends React.Component {
                     <RootStack.Screen
                         name={SCREENS.VALIDATE_LOGIN}
                         options={{
+                            ...screenOptions.fullScreen,
                             headerShown: false,
                             title: 'New Expensify',
                         }}
@@ -264,6 +265,16 @@ class AuthScreens extends React.Component {
                             return ConciergePage;
                         }}
                     />
+                    <RootStack.Screen
+                        name={CONST.DEMO_PAGES.SAASTR}
+                        options={defaultScreenOptions}
+                        component={DemoSetupPage}
+                    />
+                    <RootStack.Screen
+                        name={CONST.DEMO_PAGES.SBE}
+                        options={defaultScreenOptions}
+                        component={DemoSetupPage}
+                    />
                     <RootStack.Screen
                         name={SCREENS.REPORT_ATTACHMENTS}
                         options={{
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 2adaf0397a2c..392781a777db 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -90,6 +90,13 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([
         },
         name: 'Money_Request_Category',
     },
+    {
+        getComponent: () => {
+            const MoneyRequestTagPage = require('../../../pages/iou/MoneyRequestTagPage').default;
+            return MoneyRequestTagPage;
+        },
+        name: 'Money_Request_Tag',
+    },
     {
         getComponent: () => {
             const MoneyRequestMerchantPage = require('../../../pages/iou/MoneyRequestMerchantPage').default;
@@ -125,6 +132,13 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([
         },
         name: 'Money_Request_Waypoint',
     },
+    {
+        getComponent: () => {
+            const DistanceRequestEditPage = require('../../../pages/iou/DistanceRequestPage').default;
+            return DistanceRequestEditPage;
+        },
+        name: 'Money_Request_Address',
+    },
 ]);
 
 const SplitDetailsModalStackNavigator = createModalStackNavigator([
@@ -259,21 +273,11 @@ const SearchModalStackNavigator = createModalStackNavigator([
     },
 ]);
 
-const NewGroupModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const NewGroupPage = require('../../../pages/NewGroupPage').default;
-            return NewGroupPage;
-        },
-        name: 'NewGroup_Root',
-    },
-]);
-
 const NewChatModalStackNavigator = createModalStackNavigator([
     {
         getComponent: () => {
-            const NewChatPage = require('../../../pages/NewChatPage').default;
-            return NewChatPage;
+            const NewChatSelectorPage = require('../../../pages/NewChatSelectorPage').default;
+            return NewChatSelectorPage;
         },
         name: 'NewChat_Root',
     },
@@ -546,13 +550,6 @@ const SettingsModalStackNavigator = createModalStackNavigator([
         },
         name: 'Settings_Wallet_Choose_Transfer_Account',
     },
-    {
-        getComponent: () => {
-            const SettingsAddPayPalMePage = require('../../../pages/settings/Wallet/AddPayPalMePage').default;
-            return SettingsAddPayPalMePage;
-        },
-        name: 'Settings_Add_Paypal_Me',
-    },
     {
         getComponent: () => {
             const EnablePaymentsPage = require('../../../pages/EnablePayments/EnablePaymentsPage').default;
@@ -665,13 +662,6 @@ const SettingsModalStackNavigator = createModalStackNavigator([
         },
         name: 'Workspace_Invite_Message',
     },
-    {
-        getComponent: () => {
-            const WorkspaceNewRoomPage = require('../../../pages/workspace/WorkspaceNewRoomPage').default;
-            return WorkspaceNewRoomPage;
-        },
-        name: 'Workspace_NewRoom',
-    },
     {
         getComponent: () => {
             const ReimbursementAccountPage = require('../../../pages/ReimbursementAccount/ReimbursementAccountPage').default;
@@ -763,6 +753,30 @@ const EditRequestStackNavigator = createModalStackNavigator([
     },
 ]);
 
+const PrivateNotesModalStackNavigator = createModalStackNavigator([
+    {
+        getComponent: () => {
+            const PrivateNotesPage = require('../../../pages/PrivateNotes/PrivateNotesViewPage').default;
+            return PrivateNotesPage;
+        },
+        name: 'PrivateNotes_View',
+    },
+    {
+        getComponent: () => {
+            const PrivateNotesListPage = require('../../../pages/PrivateNotes/PrivateNotesListPage').default;
+            return PrivateNotesListPage;
+        },
+        name: 'PrivateNotes_List',
+    },
+    {
+        getComponent: () => {
+            const PrivateNotesEditPage = require('../../../pages/PrivateNotes/PrivateNotesEditPage').default;
+            return PrivateNotesEditPage;
+        },
+        name: 'PrivateNotes_Edit',
+    },
+]);
+
 const SignInModalStackNavigator = createModalStackNavigator([
     {
         getComponent: () => {
@@ -784,7 +798,6 @@ export {
     ReportWelcomeMessageModalStackNavigator,
     ReportParticipantsModalStackNavigator,
     SearchModalStackNavigator,
-    NewGroupModalStackNavigator,
     NewChatModalStackNavigator,
     NewTaskModalStackNavigator,
     SettingsModalStackNavigator,
@@ -794,6 +807,7 @@ export {
     WalletStatementStackNavigator,
     FlagCommentStackNavigator,
     EditRequestStackNavigator,
+    PrivateNotesModalStackNavigator,
     NewTeachersUniteNavigator,
     SignInModalStackNavigator,
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
index f685497e477b..64eadcbe06c3 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
@@ -2,11 +2,9 @@ import React from 'react';
 import {createStackNavigator} from '@react-navigation/stack';
 import SCREENS from '../../../../SCREENS';
 import ReportScreenWrapper from '../ReportScreenWrapper';
-import DemoSetupPage from '../../../../pages/DemoSetupPage';
 import getCurrentUrl from '../../currentUrl';
 import styles from '../../../../styles/styles';
 import FreezeWrapper from '../../FreezeWrapper';
-import CONST from '../../../../CONST';
 
 const Stack = createStackNavigator();
 
@@ -30,22 +28,6 @@ function CentralPaneNavigator() {
                     }}
                     component={ReportScreenWrapper}
                 />
-                <Stack.Screen
-                    name={CONST.DEMO_PAGES.SAASTR}
-                    options={{
-                        headerShown: false,
-                        title: 'New Expensify',
-                    }}
-                    component={DemoSetupPage}
-                />
-                <Stack.Screen
-                    name={CONST.DEMO_PAGES.SBE}
-                    options={{
-                        headerShown: false,
-                        title: 'New Expensify',
-                    }}
-                    component={DemoSetupPage}
-                />
             </Stack.Navigator>
         </FreezeWrapper>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index f6ea89ecd088..27a15fa3d763 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -32,14 +32,6 @@ function RightModalNavigator(props) {
                         name="NewChat"
                         component={ModalStackNavigators.NewChatModalStackNavigator}
                     />
-                    <Stack.Screen
-                        name="NewGroup"
-                        component={ModalStackNavigators.NewGroupModalStackNavigator}
-                        options={{
-                            // Disable animation for this screen because it causes an animation glitch when using shortcuts
-                            animationEnabled: false,
-                        }}
-                    />
                     <Stack.Screen
                         name="Search"
                         component={ModalStackNavigators.SearchModalStackNavigator}
@@ -116,6 +108,10 @@ function RightModalNavigator(props) {
                         name="SignIn"
                         component={ModalStackNavigators.SignInModalStackNavigator}
                     />
+                    <Stack.Screen
+                        name="Private_Notes"
+                        component={ModalStackNavigators.PrivateNotesModalStackNavigator}
+                    />
                 </Stack.Navigator>
             </View>
         </NoDropZone>
diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index 677981fcbeba..b574b4ffa205 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -161,7 +161,7 @@ function dismissModal(targetReportID) {
     const lastRoute = _.last(rootState.routes);
     switch (lastRoute.name) {
         case NAVIGATORS.RIGHT_MODAL_NAVIGATOR:
-        case NAVIGATORS.FULL_SCREEN_NAVIGATOR:
+        case SCREENS.NOT_FOUND:
         case SCREENS.REPORT_ATTACHMENTS:
             // if we are not in the target report, we need to navigate to it after dismissing the modal
             if (targetReportID && targetReportID !== getTopmostReportId(rootState)) {
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 42d6627d6699..9e3cad6144dd 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -11,6 +11,8 @@ import Log from '../Log';
 import StatusBar from '../StatusBar';
 import useCurrentReportID from '../../hooks/useCurrentReportID';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
+import * as ReportActionContextMenu from '../../pages/home/report/ContextMenu/ReportActionContextMenu';
+import * as EmojiPickerAction from '../actions/EmojiPickerAction';
 
 // https://reactnavigation.org/docs/themes
 const navigationTheme = {
@@ -72,12 +74,12 @@ function NavigationRoot(props) {
     }, [isSmallScreenWidth]);
 
     useEffect(() => {
-        if (!navigationRef.isReady()) {
+        if (!navigationRef.isReady() || !props.authenticated) {
             return;
         }
         // We need to force state rehydration so the CustomRouter can add the CentralPaneNavigator route if necessary.
         navigationRef.resetRoot(navigationRef.getRootState());
-    }, [isSmallScreenWidth]);
+    }, [isSmallScreenWidth, props.authenticated]);
 
     const prevStatusBarBackgroundColor = useRef(themeColors.appBG);
     const statusBarBackgroundColor = useRef(themeColors.appBG);
@@ -86,7 +88,12 @@ function NavigationRoot(props) {
     const updateStatusBarBackgroundColor = (color) => StatusBar.setBackgroundColor(color);
     useAnimatedReaction(
         () => statusBarAnimation.value,
-        () => {
+        (current, previous) => {
+            // Do not run if either of the animated value is null
+            // or previous animated value is greater than or equal to the current one
+            if ([current, previous].includes(null) || current <= previous) {
+                return;
+            }
             const color = interpolateColor(statusBarAnimation.value, [0, 1], [prevStatusBarBackgroundColor.current, statusBarBackgroundColor.current]);
             runOnJS(updateStatusBarBackgroundColor)(color);
         },
@@ -116,6 +123,10 @@ function NavigationRoot(props) {
         if (!state) {
             return;
         }
+        ReportActionContextMenu.hideContextMenu();
+        ReportActionContextMenu.hideDeleteModal();
+        EmojiPickerAction.hideEmojiPicker(true);
+
         updateCurrentReportID(state);
         parseAndLogRoute(state);
         animateStatusBarBackgroundColor();
diff --git a/src/libs/Navigation/OnyxTabNavigator.js b/src/libs/Navigation/OnyxTabNavigator.js
index d1717cc8a481..dc68021bf515 100644
--- a/src/libs/Navigation/OnyxTabNavigator.js
+++ b/src/libs/Navigation/OnyxTabNavigator.js
@@ -54,6 +54,6 @@ OnyxTabNavigator.displayName = 'OnyxTabNavigator';
 
 export default withOnyx({
     selectedTab: {
-        key: ({id}) => `${ONYXKEYS.SELECTED_TAB}_${id}`,
+        key: ({id}) => `${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`,
     },
 })(OnyxTabNavigator);
diff --git a/src/libs/Navigation/currentUrl/index.js b/src/libs/Navigation/currentUrl/index.js
deleted file mode 100644
index 48339f4690a6..000000000000
--- a/src/libs/Navigation/currentUrl/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @returns {String}
- */
-export default function getCurrentUrl() {
-    return window.location.href;
-}
diff --git a/src/libs/Navigation/currentUrl/index.native.js b/src/libs/Navigation/currentUrl/index.native.js
deleted file mode 100644
index 265b1bf4efd6..000000000000
--- a/src/libs/Navigation/currentUrl/index.native.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @returns {String}
- */
-export default function getCurrentUrl() {
-    return '';
-}
diff --git a/src/libs/Navigation/currentUrl/index.native.ts b/src/libs/Navigation/currentUrl/index.native.ts
new file mode 100644
index 000000000000..0c12ab8b4883
--- /dev/null
+++ b/src/libs/Navigation/currentUrl/index.native.ts
@@ -0,0 +1,5 @@
+import GetCurrentUrl from './types';
+
+const getCurrentUrl: GetCurrentUrl = () => '';
+
+export default getCurrentUrl;
diff --git a/src/libs/Navigation/currentUrl/index.ts b/src/libs/Navigation/currentUrl/index.ts
new file mode 100644
index 000000000000..f9afc6e15775
--- /dev/null
+++ b/src/libs/Navigation/currentUrl/index.ts
@@ -0,0 +1,5 @@
+import GetCurrentUrl from './types';
+
+const getCurrentUrl: GetCurrentUrl = () => window.location.href;
+
+export default getCurrentUrl;
diff --git a/src/libs/Navigation/currentUrl/types.ts b/src/libs/Navigation/currentUrl/types.ts
new file mode 100644
index 000000000000..24883c562941
--- /dev/null
+++ b/src/libs/Navigation/currentUrl/types.ts
@@ -0,0 +1,3 @@
+type GetCurrentUrl = () => string;
+
+export default GetCurrentUrl;
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index 8390aa7d700b..11d21d6d005c 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -18,6 +18,10 @@ export default {
             [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
             [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS,
 
+            // Demo routes
+            [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR,
+            [CONST.DEMO_PAGES.SBE]: ROUTES.SBE,
+
             // Sidebar
             [SCREENS.HOME]: {
                 path: ROUTES.HOME,
@@ -26,8 +30,6 @@ export default {
             [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: {
                 screens: {
                     [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID,
-                    [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR,
-                    [CONST.DEMO_PAGES.SBE]: ROUTES.SBE,
                 },
             },
             [SCREENS.NOT_FOUND]: '*',
@@ -83,10 +85,6 @@ export default {
                                 path: ROUTES.SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT,
                                 exact: true,
                             },
-                            Settings_Add_Paypal_Me: {
-                                path: ROUTES.SETTINGS_ADD_PAYPAL_ME,
-                                exact: true,
-                            },
                             Settings_Add_Debit_Card: {
                                 path: ROUTES.SETTINGS_ADD_DEBIT_CARD,
                                 exact: true,
@@ -202,9 +200,6 @@ export default {
                             Workspace_Invite_Message: {
                                 path: ROUTES.WORKSPACE_INVITE_MESSAGE,
                             },
-                            Workspace_NewRoom: {
-                                path: ROUTES.WORKSPACE_NEW_ROOM,
-                            },
                             ReimbursementAccount: {
                                 path: ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN,
                                 exact: true,
@@ -214,6 +209,13 @@ export default {
                             },
                         },
                     },
+                    Private_Notes: {
+                        screens: {
+                            PrivateNotes_View: ROUTES.PRIVATE_NOTES_VIEW,
+                            PrivateNotes_List: ROUTES.PRIVATE_NOTES_LIST,
+                            PrivateNotes_Edit: ROUTES.PRIVATE_NOTES_EDIT,
+                        },
+                    },
                     Report_Details: {
                         screens: {
                             Report_Details_Root: ROUTES.REPORT_WITH_ID_DETAILS,
@@ -241,14 +243,22 @@ export default {
                             Report_WelcomeMessage_Root: ROUTES.REPORT_WELCOME_MESSAGE,
                         },
                     },
-                    NewGroup: {
-                        screens: {
-                            NewGroup_Root: ROUTES.NEW_GROUP,
-                        },
-                    },
                     NewChat: {
                         screens: {
-                            NewChat_Root: ROUTES.NEW_CHAT,
+                            NewChat_Root: {
+                                path: ROUTES.NEW,
+                                exact: true,
+                                screens: {
+                                    chat: {
+                                        path: ROUTES.NEW_CHAT,
+                                        exact: true,
+                                    },
+                                    room: {
+                                        path: ROUTES.NEW_ROOM,
+                                        exact: true,
+                                    },
+                                },
+                            },
                         },
                     },
                     NewTask: {
@@ -263,7 +273,7 @@ export default {
                     },
                     TeachersUnite: {
                         screens: {
-                            SaveTheWorld_Root: ROUTES.SAVE_THE_WORLD,
+                            SaveTheWorld_Root: ROUTES.TEACHERS_UNITE,
                             I_Know_A_Teacher: ROUTES.I_KNOW_A_TEACHER,
                             Intro_School_Principal: ROUTES.INTRO_SCHOOL_PRINCIPAL,
                             I_Am_A_Teacher: ROUTES.I_AM_A_TEACHER,
@@ -316,8 +326,10 @@ export default {
                             Money_Request_Currency: ROUTES.MONEY_REQUEST_CURRENCY,
                             Money_Request_Description: ROUTES.MONEY_REQUEST_DESCRIPTION,
                             Money_Request_Category: ROUTES.MONEY_REQUEST_CATEGORY,
+                            Money_Request_Tag: ROUTES.MONEY_REQUEST_TAG,
                             Money_Request_Merchant: ROUTES.MONEY_REQUEST_MERCHANT,
                             Money_Request_Waypoint: ROUTES.MONEY_REQUEST_WAYPOINT,
+                            Money_Request_Address: ROUTES.MONEY_REQUEST_ADDRESS,
                             IOU_Send_Enable_Payments: ROUTES.IOU_SEND_ENABLE_PAYMENTS,
                             IOU_Send_Add_Bank_Account: ROUTES.IOU_SEND_ADD_BANK_ACCOUNT,
                             IOU_Send_Add_Debit_Card: ROUTES.IOU_SEND_ADD_DEBIT_CARD,
diff --git a/src/libs/Network/SequentialQueue.js b/src/libs/Network/SequentialQueue.js
index f8ea396663a5..e53515fb5e87 100644
--- a/src/libs/Network/SequentialQueue.js
+++ b/src/libs/Network/SequentialQueue.js
@@ -21,6 +21,30 @@ let isSequentialQueueRunning = false;
 let currentRequest = null;
 let isQueuePaused = false;
 
+/**
+ * Puts the queue into a paused state so that no requests will be processed
+ */
+function pause() {
+    if (isQueuePaused) {
+        return;
+    }
+
+    console.debug('[SequentialQueue] Pausing the queue');
+    isQueuePaused = true;
+}
+
+/**
+ * Gets the current Onyx queued updates, apply them and clear the queue if the queue is not paused.
+ */
+function flushOnyxUpdatesQueue() {
+    // The only situation where the queue is paused is if we found a gap between the app current data state and our server's. If that happens,
+    // we'll trigger async calls to make the client updated again. While we do that, we don't want to insert anything in Onyx.
+    if (isQueuePaused) {
+        return;
+    }
+    QueuedOnyxUpdates.flushQueue();
+}
+
 /**
  * Process any persisted requests, when online, one at a time until the queue is empty.
  *
@@ -44,7 +68,12 @@ function process() {
 
     // Set the current request to a promise awaiting its processing so that getCurrentRequest can be used to take some action after the current request has processed.
     currentRequest = Request.processWithMiddleware(requestToProcess, true)
-        .then(() => {
+        .then((response) => {
+            // A response might indicate that the queue should be paused. This happens when a gap in onyx updates is detected between the client and the server and
+            // that gap needs resolved before the queue can continue.
+            if (response.shouldPauseQueue) {
+                pause();
+            }
             PersistedRequests.remove(requestToProcess);
             RequestThrottle.clear();
             return process();
@@ -94,12 +123,27 @@ function flush() {
                 isSequentialQueueRunning = false;
                 resolveIsReadyPromise();
                 currentRequest = null;
-                Onyx.update(QueuedOnyxUpdates.getQueuedUpdates()).then(QueuedOnyxUpdates.clear);
+                flushOnyxUpdatesQueue();
             });
         },
     });
 }
 
+/**
+ * Unpauses the queue and flushes all the requests that were in it or were added to it while paused
+ */
+function unpause() {
+    if (!isQueuePaused) {
+        return;
+    }
+
+    const numberOfPersistedRequests = PersistedRequests.getAll().length || 0;
+    console.debug(`[SequentialQueue] Unpausing the queue and flushing ${numberOfPersistedRequests} requests`);
+    isQueuePaused = false;
+    flushOnyxUpdatesQueue();
+    flush();
+}
+
 /**
  * @returns {Boolean}
  */
@@ -149,30 +193,4 @@ function waitForIdle() {
     return isReadyPromise;
 }
 
-/**
- * Puts the queue into a paused state so that no requests will be processed
- */
-function pause() {
-    if (isQueuePaused) {
-        return;
-    }
-
-    console.debug('[SequentialQueue] Pausing the queue');
-    isQueuePaused = true;
-}
-
-/**
- * Unpauses the queue and flushes all the requests that were in it or were added to it while paused
- */
-function unpause() {
-    if (!isQueuePaused) {
-        return;
-    }
-
-    const numberOfPersistedRequests = PersistedRequests.getAll().length || 0;
-    console.debug(`[SequentialQueue] Unpausing the queue and flushing ${numberOfPersistedRequests} requests`);
-    isQueuePaused = false;
-    flush();
-}
-
 export {flush, getCurrentRequest, isRunning, push, waitForIdle, pause, unpause};
diff --git a/src/libs/Notification/__mocks__/LocalNotification.js b/src/libs/Notification/__mocks__/LocalNotification.ts
similarity index 71%
rename from src/libs/Notification/__mocks__/LocalNotification.js
rename to src/libs/Notification/__mocks__/LocalNotification.ts
index fa97f7f7515e..5ba17cc0f407 100644
--- a/src/libs/Notification/__mocks__/LocalNotification.js
+++ b/src/libs/Notification/__mocks__/LocalNotification.ts
@@ -2,6 +2,12 @@
 // any index.native.js files as they are using a react-native plugin. However, it is useful to mock this behavior so that we
 // can test the expected web behavior and see if a browser notification would be shown or not.
 
-export default {
+type LocalNotification = {
+    showCommentNotification: () => void;
+};
+
+const localNotification: LocalNotification = {
     showCommentNotification: jest.fn(),
 };
+
+export default localNotification;
diff --git a/src/libs/NumberFormatUtils.js b/src/libs/NumberFormatUtils.js
deleted file mode 100644
index 48e4d3dadbb6..000000000000
--- a/src/libs/NumberFormatUtils.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function format(locale, number, options) {
-    return new Intl.NumberFormat(locale, options).format(number);
-}
-
-function formatToParts(locale, number, options) {
-    return new Intl.NumberFormat(locale, options).formatToParts(number);
-}
-
-export {format, formatToParts};
diff --git a/src/libs/NumberFormatUtils.ts b/src/libs/NumberFormatUtils.ts
new file mode 100644
index 000000000000..7c81e71f4db8
--- /dev/null
+++ b/src/libs/NumberFormatUtils.ts
@@ -0,0 +1,9 @@
+function format(locale: string, number: number, options?: Intl.NumberFormatOptions): string {
+    return new Intl.NumberFormat(locale, options).format(number);
+}
+
+function formatToParts(locale: string, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] {
+    return new Intl.NumberFormat(locale, options).formatToParts(number);
+}
+
+export {format, formatToParts};
diff --git a/src/libs/NumberUtils.js b/src/libs/NumberUtils.ts
similarity index 66%
rename from src/libs/NumberUtils.js
rename to src/libs/NumberUtils.ts
index f8d110bd0b00..0d2b4135c5b6 100644
--- a/src/libs/NumberUtils.js
+++ b/src/libs/NumberUtils.ts
@@ -1,11 +1,11 @@
-import _ from 'underscore';
 import CONST from '../CONST';
 
 /**
  * Generates a random positive 64 bit numeric string by randomly generating the left, middle, and right parts and concatenating them. Used to generate client-side ids.
- * @returns {String} string representation of a randomly generated 64 bit signed integer
+ *
+ * @returns string representation of a randomly generated 64 bit signed integer
  */
-function rand64() {
+function rand64(): string {
     // Max 64-bit signed:
     // 9,223,372,036,854,775,807
     // The left part of the max 64-bit number *+1* because we're flooring it.
@@ -38,13 +38,25 @@ function rand64() {
 
 /**
  * Returns a hexadecimal value of the specified length
- * @param {Number} num
- * @returns {String}
  */
-function generateHexadecimalValue(num) {
-    return _.times(num, () => Math.floor(Math.random() * 16).toString(16))
-        .join('')
-        .toUpperCase();
+function generateHexadecimalValue(num: number): string {
+    const result: string[] = [];
+    for (let i = 0; i < num; i++) {
+        result.push(Math.floor(Math.random() * 16).toString(16));
+    }
+    return result.join('').toUpperCase();
+}
+
+/**
+ * Generates a random integer between a and b
+ * It's and equivalent of _.random(a, b)
+ *
+ * @returns random integer between a and b
+ */
+function generateRandomInt(a: number, b: number): number {
+    const lower = Math.ceil(Math.min(a, b));
+    const upper = Math.floor(Math.max(a, b));
+    return Math.floor(lower + Math.random() * (upper - lower + 1));
 }
 
-export {rand64, generateHexadecimalValue};
+export {rand64, generateHexadecimalValue, generateRandomInt};
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 90f12bdfbcce..8705d9f78004 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -17,6 +17,7 @@ import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as UserUtils from './UserUtils';
 import * as ReportActionUtils from './ReportActionsUtils';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
+import * as ErrorUtils from './ErrorUtils';
 
 /**
  * OptionsListUtils is used to build a list options passed to the OptionsList component. Several different UI views can
@@ -227,7 +228,6 @@ function getParticipantsOptions(participants, personalDetails) {
                     id: detail.accountID,
                 },
             ],
-            payPalMeAddress: lodashGet(detail, 'payPalMeAddress', ''),
             phoneNumber: lodashGet(detail, 'phoneNumber', ''),
             selected: participant.selected,
         };
@@ -350,11 +350,20 @@ function getSearchText(report, reportName, personalDetailList, isChatRoomOrPolic
 function getAllReportErrors(report, reportActions) {
     const reportErrors = report.errors || {};
     const reportErrorFields = report.errorFields || {};
-    const reportActionErrors = _.reduce(
-        reportActions,
-        (prevReportActionErrors, action) => (!action || _.isEmpty(action.errors) ? prevReportActionErrors : _.extend(prevReportActionErrors, action.errors)),
-        {},
-    );
+    const reportActionErrors = {};
+    _.each(reportActions, (action) => {
+        if (action && !_.isEmpty(action.errors)) {
+            _.extend(reportActionErrors, action.errors);
+        } else if (ReportActionUtils.isReportPreviewAction(action)) {
+            const iouReportID = ReportActionUtils.getIOUReportIDFromReportActionPreview(action);
+
+            // Instead of adding all Smartscan errors, let's just add a generic error if there are any. This
+            // will be more performant and provide the same result in the UI
+            if (ReportUtils.hasMissingSmartscanFields(iouReportID)) {
+                _.extend(reportActionErrors, {smartscan: ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage')});
+            }
+        }
+    });
 
     // All error objects related to the report. Each object in the sources contains error messages keyed by microtime
     const errorSources = {
@@ -384,7 +393,7 @@ function getLastMessageTextForReport(report) {
     if (ReportUtils.isReportMessageAttachment({text: report.lastMessageText, html: report.lastMessageHtml, translationKey: report.lastMessageTranslationKey})) {
         lastMessageTextFromReport = `[${Localize.translateLocal(report.lastMessageTranslationKey || 'common.attachment')}]`;
     } else if (ReportActionUtils.isMoneyRequestAction(lastReportAction)) {
-        lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(report, lastReportAction);
+        lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(report, lastReportAction, true);
     } else if (ReportActionUtils.isReportPreviewAction(lastReportAction)) {
         const iouReport = ReportUtils.getReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
         lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(iouReport, lastReportAction);
@@ -436,7 +445,6 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         login: null,
         reportID: null,
         phoneNumber: null,
-        payPalMeAddress: null,
         hasDraftComment: false,
         keyForList: null,
         searchText: null,
@@ -452,6 +460,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         shouldShowSubscript: false,
         isPolicyExpenseChat: false,
         isExpenseReport: false,
+        policyID: null,
     };
 
     const personalDetailMap = getPersonalDetailsForAccountIDs(accountIDs, personalDetails);
@@ -486,6 +495,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         result.tooltipText = ReportUtils.getReportParticipantsTitle(report.participantAccountIDs || []);
         result.hasOutstandingIOU = report.hasOutstandingIOU;
         result.isWaitingOnBankAccount = report.isWaitingOnBankAccount;
+        result.policyID = report.policyID;
 
         hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
         subtitle = ReportUtils.getChatRoomSubtitle(report);
@@ -528,7 +538,6 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         result.login = personalDetail.login;
         result.accountID = Number(personalDetail.accountID);
         result.phoneNumber = personalDetail.phoneNumber;
-        result.payPalMeAddress = personalDetail.payPalMeAddress;
     }
 
     result.text = reportName;
@@ -587,6 +596,146 @@ function isCurrentUser(userDetails) {
     return _.some(_.keys(loginList), (login) => login.toLowerCase() === userDetailsLogin.toLowerCase());
 }
 
+/**
+ * Build the options for the category tree hierarchy via indents
+ *
+ * @param {Object[]} options - an initial strings array
+ * @param {Boolean} options[].enabled - a flag to enable/disable option in a list
+ * @param {String} options[].name - a name of an option
+ * @param {Boolean} [isOneLine] - a flag to determine if text should be one line
+ * @returns {Array<Object>}
+ */
+function getCategoryOptionTree(options, isOneLine = false) {
+    const optionCollection = {};
+
+    _.each(options, (option) => {
+        if (isOneLine) {
+            if (_.has(optionCollection, option.name)) {
+                return;
+            }
+
+            optionCollection[option.name] = {
+                text: option.name,
+                keyForList: option.name,
+                searchText: option.name,
+                tooltipText: option.name,
+                isDisabled: !option.enabled,
+            };
+
+            return;
+        }
+
+        option.name.split(CONST.PARENT_CHILD_SEPARATOR).forEach((optionName, index, array) => {
+            const indents = _.times(index, () => CONST.INDENTS).join('');
+            const isChild = array.length - 1 === index;
+
+            if (_.has(optionCollection, optionName)) {
+                return;
+            }
+
+            optionCollection[optionName] = {
+                text: `${indents}${optionName}`,
+                keyForList: optionName,
+                searchText: array.slice(0, index + 1).join(CONST.PARENT_CHILD_SEPARATOR),
+                tooltipText: optionName,
+                isDisabled: isChild ? !option.enabled : true,
+            };
+        });
+    });
+
+    return _.values(optionCollection);
+}
+
+/**
+ * Build the section list for categories
+ *
+ * @param {Object<String, {name: String, enabled: Boolean}>} categories
+ * @param {String[]} recentlyUsedCategories
+ * @param {Object[]} selectedOptions
+ * @param {String} selectedOptions[].name
+ * @param {String} searchInputValue
+ * @param {Number} maxRecentReportsToShow
+ * @returns {Array<Object>}
+ */
+function getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow) {
+    const categorySections = [];
+    const categoriesValues = _.values(categories);
+    const numberOfCategories = _.size(categoriesValues);
+    let indexOffset = 0;
+
+    if (!_.isEmpty(searchInputValue)) {
+        const searchCategories = _.filter(categoriesValues, (category) => category.name.toLowerCase().includes(searchInputValue.toLowerCase()));
+
+        categorySections.push({
+            // "Search" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getCategoryOptionTree(searchCategories, true),
+        });
+
+        return categorySections;
+    }
+
+    if (numberOfCategories < CONST.CATEGORY_LIST_THRESHOLD) {
+        categorySections.push({
+            // "All" section when items amount less than the threshold
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getCategoryOptionTree(categoriesValues),
+        });
+
+        return categorySections;
+    }
+
+    const selectedOptionNames = _.map(selectedOptions, (selectedOption) => selectedOption.name);
+    const filteredRecentlyUsedCategories = _.map(
+        _.filter(recentlyUsedCategories, (category) => !_.includes(selectedOptionNames, category)),
+        (category) => ({
+            name: category,
+            enabled: lodashGet(categories, `${category}.enabled`, false),
+        }),
+    );
+    const filteredCategories = _.filter(categoriesValues, (category) => !_.includes(selectedOptionNames, category.name));
+
+    if (!_.isEmpty(selectedOptions)) {
+        categorySections.push({
+            // "Selected" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getCategoryOptionTree(selectedOptions, true),
+        });
+
+        indexOffset += selectedOptions.length;
+    }
+
+    if (!_.isEmpty(filteredRecentlyUsedCategories)) {
+        const cutRecentlyUsedCategories = filteredRecentlyUsedCategories.slice(0, maxRecentReportsToShow);
+
+        categorySections.push({
+            // "Recent" section
+            title: Localize.translateLocal('common.recent'),
+            shouldShow: true,
+            indexOffset,
+            data: getCategoryOptionTree(cutRecentlyUsedCategories, true),
+        });
+
+        indexOffset += filteredRecentlyUsedCategories.length;
+    }
+
+    categorySections.push({
+        // "All" section when items amount more than the threshold
+        title: Localize.translateLocal('common.all'),
+        shouldShow: true,
+        indexOffset,
+        data: getCategoryOptionTree(filteredCategories),
+    });
+
+    return categorySections;
+}
+
 /**
  * Build the options
  *
@@ -620,15 +769,31 @@ function getOptions(
         includeMoneyRequests = false,
         excludeUnknownUsers = false,
         includeP2P = true,
+        includeCategories = false,
+        categories = {},
+        recentlyUsedCategories = [],
         canInviteUser = true,
     },
 ) {
+    if (includeCategories) {
+        const categoryOptions = getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow);
+
+        return {
+            recentReports: [],
+            personalDetails: [],
+            userToInvite: null,
+            currentUserOption: null,
+            categoryOptions,
+        };
+    }
+
     if (!isPersonalDetailsReady(personalDetails)) {
         return {
             recentReports: [],
             personalDetails: [],
             userToInvite: null,
             currentUserOption: null,
+            categoryOptions: [],
         };
     }
 
@@ -799,7 +964,7 @@ function getOptions(
     }
 
     let currentUserOption = _.find(allPersonalDetailsOptions, (personalDetailsOption) => personalDetailsOption.login === currentUserLogin);
-    if (searchValue && !isSearchStringMatch(searchValue, currentUserOption.searchText)) {
+    if (searchValue && currentUserOption && !isSearchStringMatch(searchValue, currentUserOption.searchText)) {
         currentUserOption = null;
     }
 
@@ -878,6 +1043,7 @@ function getOptions(
         recentReports: recentReportOptions,
         userToInvite: canInviteUser ? userToInvite : null,
         currentUserOption,
+        categoryOptions: [],
     };
 }
 
@@ -959,6 +1125,9 @@ function getIOUConfirmationOptionsFromParticipants(participants, amountText) {
  * @param {Array} [excludeLogins]
  * @param {Boolean} [includeOwnedWorkspaceChats]
  * @param {boolean} [includeP2P]
+ * @param {boolean} [includeCategories]
+ * @param {Object} [categories]
+ * @param {Array<String>} [recentlyUsedCategories]
  * @param {boolean} [canInviteUser]
  * @returns {Object}
  */
@@ -971,6 +1140,9 @@ function getNewChatOptions(
     excludeLogins = [],
     includeOwnedWorkspaceChats = false,
     includeP2P = true,
+    includeCategories = false,
+    categories = {},
+    recentlyUsedCategories = [],
     canInviteUser = true,
 ) {
     return getOptions(reports, personalDetails, {
@@ -983,6 +1155,9 @@ function getNewChatOptions(
         excludeLogins,
         includeOwnedWorkspaceChats,
         includeP2P,
+        includeCategories,
+        categories,
+        recentlyUsedCategories,
         canInviteUser,
     });
 }
@@ -1152,5 +1327,6 @@ export {
     isSearchStringMatch,
     shouldOptionShowTooltip,
     getLastMessageTextForReport,
+    getCategoryOptionTree,
     formatMemberForList,
 };
diff --git a/src/libs/PaymentUtils.js b/src/libs/PaymentUtils.js
index c211f9538960..67d7c74869fc 100644
--- a/src/libs/PaymentUtils.js
+++ b/src/libs/PaymentUtils.js
@@ -1,7 +1,6 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import BankAccount from './models/BankAccount';
-import * as Expensicons from '../components/Icon/Expensicons';
 import getBankIcon from '../components/Icon/BankIcons';
 import CONST from '../CONST';
 import * as Localize from './Localize';
@@ -26,14 +25,11 @@ function hasExpensifyPaymentMethod(fundList = [], bankAccountList = []) {
 }
 
 /**
- * @param {String} [accountType] - one of {'bankAccount', 'debitCard', 'payPalMe'}
+ * @param {String} [accountType] - one of {'bankAccount', 'debitCard'}
  * @param {Object} account
  * @returns {String}
  */
 function getPaymentMethodDescription(accountType, account) {
-    if (accountType === CONST.PAYMENT_METHODS.PAYPAL) {
-        return account.username;
-    }
     if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
         return `${Localize.translateLocal('paymentMethodList.accountLastFour')} ${account.accountNumber.slice(-4)}`;
     }
@@ -47,10 +43,9 @@ function getPaymentMethodDescription(accountType, account) {
  * Get the PaymentMethods list
  * @param {Array} bankAccountList
  * @param {Array} fundList
- * @param {Object} [payPalMeData = null]
  * @returns {Array<PaymentMethod>}
  */
-function formatPaymentMethods(bankAccountList, fundList, payPalMeData = null) {
+function formatPaymentMethods(bankAccountList, fundList) {
     const combinedPaymentMethods = [];
 
     _.each(bankAccountList, (bankAccount) => {
@@ -82,14 +77,6 @@ function formatPaymentMethods(bankAccountList, fundList, payPalMeData = null) {
         });
     });
 
-    if (!_.isEmpty(payPalMeData)) {
-        combinedPaymentMethods.push({
-            ...payPalMeData,
-            description: getPaymentMethodDescription(payPalMeData.accountType, payPalMeData.accountData),
-            icon: Expensicons.PayPal,
-        });
-    }
-
     return combinedPaymentMethods;
 }
 
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index 7f52c41ad0fd..0294236b1cd7 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -82,24 +82,24 @@ function canUseTasks(betas) {
  * @param {Array<String>} betas
  * @returns {Boolean}
  */
-function canUseScanReceipts(betas) {
-    return _.contains(betas, CONST.BETAS.SCAN_RECEIPTS) || canUseAllBetas(betas);
+function canUseCustomStatus(betas) {
+    return _.contains(betas, CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
 }
 
 /**
  * @param {Array<String>} betas
  * @returns {Boolean}
  */
-function canUseCustomStatus(betas) {
-    return _.contains(betas, CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
+function canUseCategories(betas) {
+    return _.contains(betas, CONST.BETAS.NEW_DOT_CATEGORIES) || canUseAllBetas(betas);
 }
 
 /**
  * @param {Array<String>} betas
  * @returns {Boolean}
  */
-function canUseDistanceRequests(betas) {
-    return _.contains(betas, CONST.BETAS.DISTANCE_REQUESTS) || canUseAllBetas(betas);
+function canUseTags(betas) {
+    return _.contains(betas, CONST.BETAS.NEW_DOT_TAGS) || canUseAllBetas(betas);
 }
 
 /**
@@ -119,8 +119,8 @@ export default {
     canUseCommentLinking,
     canUsePolicyRooms,
     canUseTasks,
-    canUseScanReceipts,
     canUseCustomStatus,
-    canUseDistanceRequests,
+    canUseCategories,
+    canUseTags,
     canUseLinkPreviews,
 };
diff --git a/src/libs/PersonalDetailsUtils.js b/src/libs/PersonalDetailsUtils.js
index 1d4966826492..a401dea4b911 100644
--- a/src/libs/PersonalDetailsUtils.js
+++ b/src/libs/PersonalDetailsUtils.js
@@ -4,6 +4,7 @@ import _ from 'underscore';
 import ONYXKEYS from '../ONYXKEYS';
 import * as Localize from './Localize';
 import * as UserUtils from './UserUtils';
+import * as LocalePhoneNumber from './LocalePhoneNumber';
 
 let personalDetails = [];
 let allPersonalDetails = {};
@@ -115,7 +116,7 @@ function getNewPersonalDetailsOnyxData(logins, accountIDs) {
                 login,
                 accountID,
                 avatar: UserUtils.getDefaultAvatarURL(accountID),
-                displayName: login,
+                displayName: LocalePhoneNumber.formatPhoneNumber(login),
             };
 
             /**
diff --git a/src/libs/PusherUtils.js b/src/libs/PusherUtils.js
index 9d84bd4012fe..b4615d3c7d8b 100644
--- a/src/libs/PusherUtils.js
+++ b/src/libs/PusherUtils.js
@@ -18,12 +18,13 @@ function subscribeToMultiEvent(eventType, callback) {
 /**
  * @param {String} eventType
  * @param {Mixed} data
+ * @returns {Promise}
  */
 function triggerMultiEventHandler(eventType, data) {
     if (!multiEventCallbackMapping[eventType]) {
-        return;
+        return Promise.resolve();
     }
-    multiEventCallbackMapping[eventType](data);
+    return multiEventCallbackMapping[eventType](data);
 }
 
 /**
diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
index f7a53227d8d7..d90a6cbf0e37 100644
--- a/src/libs/ReceiptUtils.js
+++ b/src/libs/ReceiptUtils.js
@@ -4,7 +4,6 @@ import Str from 'expensify-common/lib/str';
 import * as FileUtils from './fileDownload/FileUtils';
 import CONST from '../CONST';
 import Receipt from './actions/Receipt';
-import * as Localize from './Localize';
 import ReceiptHTML from '../../assets/images/receipt-html.png';
 import ReceiptDoc from '../../assets/images/receipt-doc.png';
 import ReceiptGeneric from '../../assets/images/receipt-generic.png';
@@ -13,17 +12,17 @@ import ReceiptSVG from '../../assets/images/receipt-svg.png';
 function validateReceipt(file) {
     const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));
     if (_.contains(CONST.API_ATTACHMENT_VALIDATIONS.UNALLOWED_EXTENSIONS, fileExtension.toLowerCase())) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.wrongFileType'), Localize.translateLocal('attachmentPicker.notAllowedExtension'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.wrongFileType', 'attachmentPicker.notAllowedExtension');
         return false;
     }
 
     if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.attachmentTooLarge'), Localize.translateLocal('attachmentPicker.sizeExceeded'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.attachmentTooLarge', 'attachmentPicker.sizeExceeded');
         return false;
     }
 
     if (lodashGet(file, 'size', 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.attachmentTooSmall'), Localize.translateLocal('attachmentPicker.sizeNotMet'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet');
         return false;
     }
 
diff --git a/src/libs/ReportActionComposeFocusManager.js b/src/libs/ReportActionComposeFocusManager.ts
similarity index 65%
rename from src/libs/ReportActionComposeFocusManager.js
rename to src/libs/ReportActionComposeFocusManager.ts
index 7f31b17aaa57..83493ed71fc5 100644
--- a/src/libs/ReportActionComposeFocusManager.js
+++ b/src/libs/ReportActionComposeFocusManager.ts
@@ -1,20 +1,21 @@
-import _ from 'underscore';
 import React from 'react';
+import {TextInput} from 'react-native';
 
-const composerRef = React.createRef();
+type FocusCallback = () => void;
+
+const composerRef = React.createRef<TextInput>();
 // There are two types of composer: general composer (edit composer) and main composer.
 // The general composer callback will take priority if it exists.
-let focusCallback = null;
-let mainComposerFocusCallback = null;
+let focusCallback: FocusCallback | null = null;
+let mainComposerFocusCallback: FocusCallback | null = null;
 
 /**
  * Register a callback to be called when focus is requested.
  * Typical uses of this would be call the focus on the ReportActionComposer.
  *
- * @param {Function} callback callback to register
- * @param {Boolean} isMainComposer
+ * @param callback callback to register
  */
-function onComposerFocus(callback, isMainComposer = false) {
+function onComposerFocus(callback: FocusCallback, isMainComposer = false) {
     if (isMainComposer) {
         mainComposerFocusCallback = callback;
     } else {
@@ -24,11 +25,10 @@ function onComposerFocus(callback, isMainComposer = false) {
 
 /**
  * Request focus on the ReportActionComposer
- *
  */
 function focus() {
-    if (!_.isFunction(focusCallback)) {
-        if (!_.isFunction(mainComposerFocusCallback)) {
+    if (typeof focusCallback !== 'function') {
+        if (typeof mainComposerFocusCallback !== 'function') {
             return;
         }
 
@@ -41,8 +41,6 @@ function focus() {
 
 /**
  * Clear the registered focus callback
- *
- * @param {Boolean} isMainComposer
  */
 function clear(isMainComposer = false) {
     if (isMainComposer) {
@@ -54,10 +52,9 @@ function clear(isMainComposer = false) {
 
 /**
  * Exposes the current focus state of the report action composer.
- * @return {Boolean} isFocused
  */
-function isFocused() {
-    return composerRef.current && composerRef.current.isFocused();
+function isFocused(): boolean {
+    return !!composerRef.current?.isFocused();
 }
 
 export default {
diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 3ed10b865812..cda1f39d3087 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -1,9 +1,9 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
-import lodashMerge from 'lodash/merge';
+import {max, parseISO, isEqual} from 'date-fns';
 import lodashFindLast from 'lodash/findLast';
 import Onyx from 'react-native-onyx';
-import moment from 'moment';
 import * as CollectionUtils from './CollectionUtils';
 import CONST from '../CONST';
 import ONYXKEYS from '../ONYXKEYS';
@@ -105,11 +105,15 @@ function isWhisperAction(action) {
 }
 
 /**
+ * Returns whether the comment is a thread parent message/the first message in a thread
+ *
  * @param {Object} reportAction
+ * @param {String} reportID
  * @returns {Boolean}
  */
-function hasCommentThread(reportAction) {
-    return lodashGet(reportAction, 'childType', '') === CONST.REPORT.TYPE.CHAT && lodashGet(reportAction, 'childVisibleActionCount', 0) > 0;
+function isThreadParentMessage(reportAction = {}, reportID) {
+    const {childType, childVisibleActionCount = 0, childReportID} = reportAction;
+    return childType === CONST.REPORT.TYPE.CHAT && (childVisibleActionCount > 0 || String(childReportID) === reportID);
 }
 
 /**
@@ -118,6 +122,7 @@ function hasCommentThread(reportAction) {
  * @param {Object} report
  * @param {Object} [allReportActionsParam]
  * @returns {Object}
+ * @deprecated Use Onyx.connect() or withOnyx() instead
  */
 function getParentReportAction(report, allReportActionsParam = undefined) {
     if (!report || !report.parentReportID || !report.parentReportActionID) {
@@ -327,11 +332,7 @@ function shouldReportActionBeVisible(reportAction, key) {
     }
 
     // Filter out any unsupported reportAction types
-    if (
-        !_.has(CONST.REPORT.ACTIONS.TYPE, reportAction.actionName) &&
-        !_.contains(_.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG), reportAction.actionName) &&
-        !_.contains(_.values(CONST.REPORT.ACTIONS.TYPE.TASK), reportAction.actionName)
-    ) {
+    if (!Object.values(CONST.REPORT.ACTIONS.TYPE).includes(reportAction.actionName) && !Object.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG).includes(reportAction.actionName)) {
         return false;
     }
 
@@ -346,7 +347,7 @@ function shouldReportActionBeVisible(reportAction, key) {
 
     // All other actions are displayed except thread parents, deleted, or non-pending actions
     const isDeleted = isDeletedAction(reportAction);
-    const isPending = !_.isEmpty(reportAction.pendingAction);
+    const isPending = !!reportAction.pendingAction;
     return !isDeleted || isPending || isDeletedParentAction(reportAction);
 }
 
@@ -362,7 +363,14 @@ function shouldReportActionBeVisibleAsLastAction(reportAction) {
         return false;
     }
 
-    return shouldReportActionBeVisible(reportAction, reportAction.reportActionID) && !isWhisperAction(reportAction) && !isDeletedAction(reportAction);
+    if (!_.isEmpty(reportAction.errors)) {
+        return false;
+    }
+
+    // If a whisper action is the REPORTPREVIEW action, we are displaying it.
+    return (
+        shouldReportActionBeVisible(reportAction, reportAction.reportActionID) && !(isWhisperAction(reportAction) && !isReportPreviewAction(reportAction)) && !isDeletedAction(reportAction)
+    );
 }
 
 /**
@@ -371,14 +379,24 @@ function shouldReportActionBeVisibleAsLastAction(reportAction) {
  * @return {Object}
  */
 function getLastVisibleAction(reportID, actionsToMerge = {}) {
-    const actions = _.toArray(lodashMerge({}, allReportActions[reportID], actionsToMerge));
-    const visibleActions = _.filter(actions, (action) => shouldReportActionBeVisibleAsLastAction(action));
+    const updatedActionsToMerge = {};
+    if (actionsToMerge && Object.keys(actionsToMerge).length !== 0) {
+        Object.keys(actionsToMerge).forEach(
+            (actionToMergeID) => (updatedActionsToMerge[actionToMergeID] = {...allReportActions[reportID][actionToMergeID], ...actionsToMerge[actionToMergeID]}),
+        );
+    }
+    const actions = Object.values({
+        ...allReportActions[reportID],
+        ...updatedActionsToMerge,
+    });
+    const visibleActions = actions.filter((action) => shouldReportActionBeVisibleAsLastAction(action));
 
-    if (_.isEmpty(visibleActions)) {
+    if (visibleActions.length === 0) {
         return {};
     }
-
-    return _.max(visibleActions, (action) => moment.utc(action.created).valueOf());
+    const maxDate = max(visibleActions.map((action) => parseISO(action.created)));
+    const maxAction = visibleActions.find((action) => isEqual(parseISO(action.created), maxDate));
+    return maxAction;
 }
 
 /**
@@ -393,7 +411,7 @@ function getLastVisibleMessage(reportID, actionsToMerge = {}) {
     if (isReportMessageAttachment(message)) {
         return {
             lastMessageTranslationKey: CONST.TRANSLATION_KEYS.ATTACHMENT,
-            lastMessageText: CONST.TRANSLATION_KEYS.ATTACHMENT,
+            lastMessageText: CONST.ATTACHMENT_MESSAGE_TEXT,
             lastMessageHtml: CONST.TRANSLATION_KEYS.ATTACHMENT,
         };
     }
@@ -608,6 +626,17 @@ function getAllReportActions(reportID) {
     return lodashGet(allReportActions, reportID, []);
 }
 
+/**
+ * Check whether a report action is an attachment (a file, such as an image or a zip).
+ *
+ * @param {Object} reportAction report action
+ * @returns {Boolean}
+ */
+function isReportActionAttachment(reportAction) {
+    const message = _.first(lodashGet(reportAction, 'message', [{}]));
+    return _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : isReportMessageAttachment(message);
+}
+
 export {
     getSortedReportActions,
     getLastVisibleAction,
@@ -624,7 +653,7 @@ export {
     getLastClosedReportAction,
     getLatestReportActionFromOnyxData,
     isMoneyRequestAction,
-    hasCommentThread,
+    isThreadParentMessage,
     getLinkedTransactionID,
     getMostRecentReportActionLastModified,
     getReportPreviewAction,
@@ -645,4 +674,5 @@ export {
     isSplitBillAction,
     isTaskAction,
     getAllReportActions,
+    isReportActionAttachment,
 };
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index d1a2a8a40e25..8e9cea908f74 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1,3 +1,4 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import _ from 'underscore';
 import {format, parseISO} from 'date-fns';
 import Str from 'expensify-common/lib/str';
@@ -86,8 +87,8 @@ function getChatType(report) {
  * @returns {Object}
  */
 function getPolicy(policyID) {
-    const policy = lodashGet(allPolicies, `${ONYXKEYS.COLLECTION.POLICY}${policyID}`) || {};
-    return policy;
+    if (!allPolicies || !policyID) return {};
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] || {};
 }
 
 /**
@@ -124,7 +125,9 @@ function getPolicyName(report, returnEmptyIfNotFound = false, policy = undefined
 
     // Public rooms send back the policy name with the reportSummary,
     // since they can also be accessed by people who aren't in the workspace
-    return lodashGet(finalPolicy, 'name') || report.policyName || report.oldPolicyName || noPolicyFound;
+    const policyName = lodashGet(finalPolicy, 'name') || report.policyName || report.oldPolicyName || noPolicyFound;
+
+    return policyName;
 }
 
 /**
@@ -151,7 +154,7 @@ function getReportParticipantsTitle(accountIDs) {
  * @returns {Boolean}
  */
 function isChatReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.CHAT;
+    return report && report.type === CONST.REPORT.TYPE.CHAT;
 }
 
 /**
@@ -161,7 +164,7 @@ function isChatReport(report) {
  * @returns {Boolean}
  */
 function isExpenseReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.EXPENSE;
+    return report && report.type === CONST.REPORT.TYPE.EXPENSE;
 }
 
 /**
@@ -171,7 +174,7 @@ function isExpenseReport(report) {
  * @returns {Boolean}
  */
 function isIOUReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.IOU;
+    return report && report.type === CONST.REPORT.TYPE.IOU;
 }
 
 /**
@@ -181,27 +184,41 @@ function isIOUReport(report) {
  * @returns {Boolean}
  */
 function isTaskReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.TASK;
+    return report && report.type === CONST.REPORT.TYPE.TASK;
 }
 
 /**
- * Checks if a report is an open task report.
+ * Checks if a task has been cancelled
+ * When a task is deleted, the parentReportAction is updated to have a isDeletedParentAction deleted flag
+ * This is because when you delete a task, we still allow you to chat on the report itself
+ * There's another situation where you don't have access to the parentReportAction (because it was created in a chat you don't have access to)
+ * In this case, we have added the key to the report itself
  *
  * @param {Object} report
+ * @param {Object} parentReportAction
  * @returns {Boolean}
  */
-function isOpenTaskReport(report) {
-    return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS.OPEN;
+function isCanceledTaskReport(report = {}, parentReportAction = {}) {
+    if (!_.isEmpty(parentReportAction) && lodashGet(parentReportAction, ['message', 0, 'isDeletedParentAction'], false)) {
+        return true;
+    }
+
+    if (!_.isEmpty(report) && report.isDeletedParentAction) {
+        return true;
+    }
+
+    return false;
 }
 
 /**
- * Checks if the current user is assigned to the task report
+ * Checks if a report is an open task report.
  *
  * @param {Object} report
+ * @param {Object} parentReportAction - The parent report action of the report (Used to check if the task has been canceled)
  * @returns {Boolean}
  */
-function isCanceledTaskReport(report) {
-    return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.CLOSED;
+function isOpenTaskReport(report, parentReportAction = {}) {
+    return isTaskReport(report) && !isCanceledTaskReport(report, parentReportAction) && report.stateNum === CONST.REPORT.STATE_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS.OPEN;
 }
 
 /**
@@ -221,7 +238,7 @@ function isCompletedTaskReport(report) {
  * @returns {Boolean}
  */
 function isReportManager(report) {
-    return lodashGet(report, 'managerID') === currentUserAccountID;
+    return report && report.managerID === currentUserAccountID;
 }
 
 /**
@@ -231,7 +248,7 @@ function isReportManager(report) {
  * @returns {Boolean}
  */
 function isReportApproved(report) {
-    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.SUBMITTED && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.APPROVED;
+    return report && report.statusNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.APPROVED;
 }
 
 /**
@@ -255,9 +272,9 @@ function sortReportsByLastRead(reports) {
  * @returns {Boolean}
  */
 function isSettled(reportID) {
-    const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-
-    if (_.isEmpty(report) || report.isWaitingOnBankAccount) {
+    if (!allReports) return false;
+    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] || {};
+    if ((typeof report === 'object' && Object.keys(report).length === 0) || report.isWaitingOnBankAccount) {
         return false;
     }
 
@@ -271,7 +288,10 @@ function isSettled(reportID) {
  * @returns {Boolean}
  */
 function isCurrentUserSubmitter(reportID) {
-    const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
+    if (!allReports) {
+        return false;
+    }
+    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] || {};
     return report && report.ownerEmail === currentUserEmail;
 }
 
@@ -378,8 +398,7 @@ function isChatRoom(report) {
  * @returns {Boolean}
  */
 function isPublicRoom(report) {
-    const visibility = lodashGet(report, 'visibility', '');
-    return visibility === CONST.REPORT.VISIBILITY.PUBLIC || visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
+    return report && (report.visibility === CONST.REPORT.VISIBILITY.PUBLIC || report.visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE);
 }
 
 /**
@@ -389,8 +408,7 @@ function isPublicRoom(report) {
  * @returns {Boolean}
  */
 function isPublicAnnounceRoom(report) {
-    const visibility = lodashGet(report, 'visibility', '');
-    return visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
+    return report && report.visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
 }
 
 /**
@@ -482,7 +500,7 @@ function shouldDisableDetailPage(report) {
  */
 function isExpensifyOnlyParticipantInReport(report) {
     const reportParticipants = _.without(lodashGet(report, 'participantAccountIDs', []), currentUserAccountID);
-    return lodashGet(report, 'participantAccountIDs', []).length === 1 && _.some(reportParticipants, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID));
+    return reportParticipants.length === 1 && _.some(reportParticipants, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID));
 }
 
 /**
@@ -560,7 +578,7 @@ function findLastAccessedReport(reports, ignoreDomainRooms, policies, isFirstTim
  * @returns {Boolean}
  */
 function isArchivedRoom(report) {
-    return lodashGet(report, ['statusNum']) === CONST.REPORT.STATUS.CLOSED && lodashGet(report, ['stateNum']) === CONST.REPORT.STATE_NUM.SUBMITTED;
+    return report && report.statusNum === CONST.REPORT.STATUS.CLOSED && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
 }
 
 /**
@@ -634,7 +652,7 @@ function isDM(report) {
  * @returns {Boolean}
  */
 function hasSingleParticipant(report) {
-    return report.participants && report.participants.length === 1;
+    return report.participantAccountIDs && report.participantAccountIDs.length === 1;
 }
 
 /**
@@ -728,7 +746,7 @@ function isMoneyRequest(reportOrID) {
  * @returns {Boolean}
  */
 function isMoneyRequestReport(reportOrID) {
-    const report = _.isObject(reportOrID) ? reportOrID : allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`];
+    const report = typeof reportOrID === 'object' ? reportOrID : allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`];
     return isIOUReport(report) || isExpenseReport(report);
 }
 
@@ -807,7 +825,7 @@ function getRoomWelcomeMessage(report, isUserPolicyAdmin) {
  * @returns {Boolean}
  */
 function chatIncludesConcierge(report) {
-    return report.participantAccountIDs && _.contains(report.participantAccountIDs, CONST.ACCOUNT_ID.CONCIERGE);
+    return !_.isEmpty(report.participantAccountIDs) && _.contains(report.participantAccountIDs, CONST.ACCOUNT_ID.CONCIERGE);
 }
 
 /**
@@ -819,6 +837,18 @@ function hasAutomatedExpensifyAccountIDs(accountIDs) {
     return _.intersection(accountIDs, CONST.EXPENSIFY_ACCOUNT_IDS).length > 0;
 }
 
+/**
+ * @param {Object} report
+ * @param {Number} currentLoginAccountID
+ * @returns {Array}
+ */
+function getReportRecipientAccountIDs(report, currentLoginAccountID) {
+    const participantAccountIDs = isTaskReport(report) ? [report.managerID] : lodashGet(report, 'participantAccountIDs');
+    const reportParticipants = _.without(participantAccountIDs, currentLoginAccountID);
+    const participantsWithoutExpensifyAccountIDs = _.difference(reportParticipants, CONST.EXPENSIFY_ACCOUNT_IDS);
+    return participantsWithoutExpensifyAccountIDs;
+}
+
 /**
  * Whether the time row should be shown for a report.
  * @param {Array<Object>} personalDetails
@@ -827,10 +857,9 @@ function hasAutomatedExpensifyAccountIDs(accountIDs) {
  * @return {Boolean}
  */
 function canShowReportRecipientLocalTime(personalDetails, report, accountID) {
-    const reportParticipants = _.without(lodashGet(report, 'participantAccountIDs', []), accountID);
-    const participantsWithoutExpensifyAccountIDs = _.difference(reportParticipants, CONST.EXPENSIFY_ACCOUNT_IDS);
-    const hasMultipleParticipants = participantsWithoutExpensifyAccountIDs.length > 1;
-    const reportRecipient = personalDetails[participantsWithoutExpensifyAccountIDs[0]];
+    const reportRecipientAccountIDs = getReportRecipientAccountIDs(report, accountID);
+    const hasMultipleParticipants = reportRecipientAccountIDs.length > 1;
+    const reportRecipient = personalDetails[reportRecipientAccountIDs[0]];
     const reportRecipientTimezone = lodashGet(reportRecipient, 'timezone', CONST.DEFAULT_TIME_ZONE);
     const isReportParticipantValidated = lodashGet(reportRecipient, 'validated', false);
     return Boolean(
@@ -1273,6 +1302,7 @@ function getTransactionDetails(transaction) {
         currency: TransactionUtils.getCurrency(transaction),
         comment: TransactionUtils.getDescription(transaction),
         merchant: TransactionUtils.getMerchant(transaction),
+        category: TransactionUtils.getCategory(transaction),
     };
 }
 
@@ -1359,6 +1389,17 @@ function areAllRequestsBeingSmartScanned(iouReportID, reportPreviewAction) {
     return _.all(transactionsWithReceipts, (transaction) => TransactionUtils.isReceiptBeingScanned(transaction));
 }
 
+/**
+ * Check if any of the transactions in the report has required missing fields
+ *
+ * @param {Object|null} iouReportID
+ * @returns {Boolean}
+ */
+function hasMissingSmartscanFields(iouReportID) {
+    const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID);
+    return _.some(transactionsWithReceipts, (transaction) => TransactionUtils.hasMissingSmartscanFields(transaction));
+}
+
 /**
  * Given a parent IOU report action get report name for the LHN.
  *
@@ -1375,6 +1416,10 @@ function getTransactionReportName(reportAction) {
         return Localize.translateLocal('iou.receiptScanning');
     }
 
+    if (TransactionUtils.hasMissingSmartscanFields(transaction)) {
+        return Localize.translateLocal('iou.receiptMissingDetails');
+    }
+
     const {amount, currency, comment} = getTransactionDetails(transaction);
 
     return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadRequestReportName', {
@@ -1387,10 +1432,11 @@ function getTransactionReportName(reportAction) {
  * Get money request message for an IOU report
  *
  * @param {Object} report
- * @param {Object} [reportAction={}]
+ * @param {Object} [reportAction={}] This can be either a report preview action or the IOU action
+ * @param {Boolean} [shouldConsiderReceiptBeingScanned=false]
  * @returns  {String}
  */
-function getReportPreviewMessage(report, reportAction = {}) {
+function getReportPreviewMessage(report, reportAction = {}, shouldConsiderReceiptBeingScanned = false) {
     const reportActionMessage = lodashGet(reportAction, 'message[0].html', '');
 
     if (_.isEmpty(report) || !report.reportID) {
@@ -1407,13 +1453,22 @@ function getReportPreviewMessage(report, reportAction = {}) {
         return `approved ${formattedAmount}`;
     }
 
+    if (shouldConsiderReceiptBeingScanned && ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+        const linkedTransaction = TransactionUtils.getLinkedTransaction(reportAction);
+
+        if (!_.isEmpty(linkedTransaction) && TransactionUtils.hasReceipt(linkedTransaction) && TransactionUtils.isReceiptBeingScanned(linkedTransaction)) {
+            return Localize.translateLocal('iou.receiptScanning');
+        }
+    }
+
     if (isSettled(report.reportID)) {
-        // A settled report preview message can come in three formats "paid ... using Paypal.me", "paid ... elsewhere" or "paid ... using Expensify"
+        // A settled report preview message can come in three formats "paid ... elsewhere" or "paid ... with Expensify"
         let translatePhraseKey = 'iou.paidElsewhereWithAmount';
-        if (reportActionMessage.match(/ Paypal.me$/)) {
-            translatePhraseKey = 'iou.paidUsingPaypalWithAmount';
-        } else if (reportActionMessage.match(/ using Expensify$/)) {
-            translatePhraseKey = 'iou.paidUsingExpensifyWithAmount';
+        if (
+            _.contains([CONST.IOU.PAYMENT_TYPE.VBBA, CONST.IOU.PAYMENT_TYPE.EXPENSIFY], reportAction.originalMessage.paymentType) ||
+            reportActionMessage.match(/ (with Expensify|using Expensify)$/)
+        ) {
+            translatePhraseKey = 'iou.paidWithExpensifyWithAmount';
         }
         return Localize.translateLocal(translatePhraseKey, {amount: formattedAmount});
     }
@@ -1439,14 +1494,15 @@ function getReportPreviewMessage(report, reportAction = {}) {
 function getProperSchemaForModifiedExpenseMessage(newValue, oldValue, valueName, valueInQuotes) {
     const newValueToDisplay = valueInQuotes ? `"${newValue}"` : newValue;
     const oldValueToDisplay = valueInQuotes ? `"${oldValue}"` : oldValue;
+    const displayValueName = valueName.toLowerCase();
 
     if (!oldValue) {
-        return `set the ${valueName} to ${newValueToDisplay}`;
+        return Localize.translateLocal('iou.setTheRequest', {valueName: displayValueName, newValueToDisplay});
     }
     if (!newValue) {
-        return `removed the ${valueName} (previously ${oldValueToDisplay})`;
+        return Localize.translateLocal('iou.removedTheRequest', {valueName: displayValueName, oldValueToDisplay});
     }
-    return `changed the ${valueName} to ${newValueToDisplay} (previously ${oldValueToDisplay})`;
+    return Localize.translateLocal('iou.updatedTheRequest', {valueName: displayValueName, newValueToDisplay, oldValueToDisplay});
 }
 
 /**
@@ -1458,7 +1514,7 @@ function getProperSchemaForModifiedExpenseMessage(newValue, oldValue, valueName,
 function getModifiedExpenseMessage(reportAction) {
     const reportActionOriginalMessage = lodashGet(reportAction, 'originalMessage', {});
     if (_.isEmpty(reportActionOriginalMessage)) {
-        return `changed the request`;
+        return Localize.translateLocal('iou.changedTheRequest');
     }
 
     const hasModifiedAmount =
@@ -1473,12 +1529,12 @@ function getModifiedExpenseMessage(reportAction) {
         const currency = reportActionOriginalMessage.currency;
         const amount = CurrencyUtils.convertToDisplayString(reportActionOriginalMessage.amount, currency);
 
-        return getProperSchemaForModifiedExpenseMessage(amount, oldAmount, 'amount', false);
+        return getProperSchemaForModifiedExpenseMessage(amount, oldAmount, Localize.translateLocal('iou.amount'), false);
     }
 
     const hasModifiedComment = _.has(reportActionOriginalMessage, 'oldComment') && _.has(reportActionOriginalMessage, 'newComment');
     if (hasModifiedComment) {
-        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.newComment, reportActionOriginalMessage.oldComment, 'description', true);
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.newComment, reportActionOriginalMessage.oldComment, Localize.translateLocal('common.description'), true);
     }
 
     const hasModifiedCreated = _.has(reportActionOriginalMessage, 'oldCreated') && _.has(reportActionOriginalMessage, 'created');
@@ -1486,12 +1542,17 @@ function getModifiedExpenseMessage(reportAction) {
         // Take only the YYYY-MM-DD value as the original date includes timestamp
         let formattedOldCreated = parseISO(reportActionOriginalMessage.oldCreated);
         formattedOldCreated = format(formattedOldCreated, CONST.DATE.FNS_FORMAT_STRING);
-        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.created, formattedOldCreated, 'date', false);
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.created, formattedOldCreated, Localize.translateLocal('common.date'), false);
     }
 
     const hasModifiedMerchant = _.has(reportActionOriginalMessage, 'oldMerchant') && _.has(reportActionOriginalMessage, 'merchant');
     if (hasModifiedMerchant) {
-        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.merchant, reportActionOriginalMessage.oldMerchant, 'merchant', true);
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.merchant, reportActionOriginalMessage.oldMerchant, Localize.translateLocal('common.merchant'), true);
+    }
+
+    const hasModifiedCategory = _.has(reportActionOriginalMessage, 'oldCategory') && _.has(reportActionOriginalMessage, 'category');
+    if (hasModifiedCategory) {
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.category, reportActionOriginalMessage.oldCategory, Localize.translateLocal('common.category'), true);
     }
 }
 
@@ -1533,6 +1594,11 @@ function getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, i
         originalMessage.currency = lodashGet(transactionChanges, 'currency', originalMessage.oldCurrency);
     }
 
+    if (_.has(transactionChanges, 'category')) {
+        originalMessage.oldCategory = TransactionUtils.getCategory(oldTransaction);
+        originalMessage.category = transactionChanges.category;
+    }
+
     return originalMessage;
 }
 
@@ -1558,13 +1624,13 @@ function getParentReport(report) {
  */
 function getReportName(report, policy = undefined) {
     let formattedName;
+    const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     if (isChatThread(report)) {
-        const parentReportAction = ReportActionsUtils.getParentReportAction(report);
         if (ReportActionsUtils.isTransactionThread(parentReportAction)) {
             return getTransactionReportName(parentReportAction);
         }
 
-        const isAttachment = _.has(parentReportAction, 'isAttachment') ? parentReportAction.isAttachment : isReportMessageAttachment(_.last(lodashGet(parentReportAction, 'message', [{}])));
+        const isAttachment = ReportActionsUtils.isReportActionAttachment(parentReportAction);
         const parentReportActionMessage = lodashGet(parentReportAction, ['message', 0, 'text'], '').replace(/(\r\n|\n|\r)/gm, ' ');
         if (isAttachment && parentReportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;
@@ -1577,6 +1643,11 @@ function getReportName(report, policy = undefined) {
         }
         return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
     }
+
+    if (isTaskReport(report) && isCanceledTaskReport(report, parentReportAction)) {
+        return Localize.translateLocal('parentReportAction.deletedTask');
+    }
+
     if (isChatRoom(report) || isTaskReport(report)) {
         formattedName = report.reportName;
     }
@@ -1612,7 +1683,7 @@ function getReportName(report, policy = undefined) {
  * @returns {Object}
  */
 function getRootReportAndWorkspaceName(report) {
-    if (isChildReport(report) && !isMoneyRequestReport(report)) {
+    if (isChildReport(report) && !isMoneyRequestReport(report) && !isTaskReport(report)) {
         const parentReport = lodashGet(allReports, [`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`]);
         return getRootReportAndWorkspaceName(parentReport);
     }
@@ -1911,6 +1982,7 @@ function buildOptimisticIOUReport(payeeAccountID, payerAccountID, total, chatRep
 
         // We don't translate reportName because the server response is always in English
         reportName: `${payerEmail} owes ${formattedTotal}`,
+        parentReportID: chatReportID,
     };
 }
 
@@ -1948,6 +2020,7 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
         state: CONST.REPORT.STATE.SUBMITTED,
         stateNum: CONST.REPORT.STATE_NUM.PROCESSING,
         total: storedTotal,
+        parentReportID: chatReportID,
     };
 }
 
@@ -1957,7 +2030,7 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
  * @param {Number} total - IOU total in cents
  * @param {String} comment - IOU comment
  * @param {String} currency - IOU currency
- * @param {String} paymentType - IOU paymentMethodType. Can be oneOf(Elsewhere, Expensify, PayPal.me)
+ * @param {String} paymentType - IOU paymentMethodType. Can be oneOf(Elsewhere, Expensify)
  * @param {Boolean} isSettlingUp - Whether we are settling up an IOU
  * @returns {Array}
  */
@@ -1969,14 +2042,12 @@ function getIOUReportActionMessage(iouReportID, type, total, comment, currency,
 
     let paymentMethodMessage;
     switch (paymentType) {
-        case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
-            paymentMethodMessage = ' elsewhere';
-            break;
         case CONST.IOU.PAYMENT_TYPE.VBBA:
-            paymentMethodMessage = ' using Expensify';
+        case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
+            paymentMethodMessage = ' with Expensify';
             break;
         default:
-            paymentMethodMessage = ` using ${paymentType}`;
+            paymentMethodMessage = ` elsewhere`;
             break;
     }
 
@@ -2020,7 +2091,7 @@ function getIOUReportActionMessage(iouReportID, type, total, comment, currency,
  * @param {String} comment - User comment for the IOU.
  * @param {Array}  participants - An array with participants details.
  * @param {String} [transactionID] - Not required if the IOUReportAction type is 'pay'
- * @param {String} [paymentType] - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, payPal, Expensify).
+ * @param {String} [paymentType] - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, Expensify).
  * @param {String} [iouReportID] - Only required if the IOUReportActions type is oneOf(decline, cancel, pay). Generates a randomID as default.
  * @param {Boolean} [isSettlingUp] - Whether we are settling up an IOU.
  * @param {Boolean} [isSendMoneyFlow] - Whether this is send money flow
@@ -2228,12 +2299,13 @@ function buildOptimisticModifiedExpenseReportAction(transactionThread, oldTransa
  *
  * @param {Object} iouReport
  * @param {Object} reportPreviewAction
+ * @param {Boolean} isPayRequest
  * @param {String} [comment] - User comment for the IOU.
  * @param {Object} [transaction] - optimistic newest transaction of a report preview
  *
  * @returns {Object}
  */
-function updateReportPreview(iouReport, reportPreviewAction, comment = '', transaction = undefined) {
+function updateReportPreview(iouReport, reportPreviewAction, isPayRequest = false, comment = '', transaction = undefined) {
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const lastReceiptTransactionIDs = lodashGet(reportPreviewAction, 'childLastReceiptTransactionIDs', '');
     const previousTransactionIDs = lastReceiptTransactionIDs.split(',').slice(0, 2);
@@ -2251,7 +2323,7 @@ function updateReportPreview(iouReport, reportPreviewAction, comment = '', trans
             },
         ],
         childLastMoneyRequestComment: comment || reportPreviewAction.childLastMoneyRequestComment,
-        childMoneyRequestCount: reportPreviewAction.childMoneyRequestCount + 1,
+        childMoneyRequestCount: reportPreviewAction.childMoneyRequestCount + (isPayRequest ? 0 : 1),
         childLastReceiptTransactionIDs: hasReceipt ? [transaction.transactionID, ...previousTransactionIDs].join(',') : lastReceiptTransactionIDs,
         // As soon as we add a transaction without a receipt to the report, it will have ready money requests,
         // so we remove the whisper
@@ -2582,7 +2654,7 @@ function buildTransactionThread(reportAction, moneyRequestReportID) {
         participantAccountIDs,
         getTransactionReportName(reportAction),
         '',
-        lodashGet(getReport(reportAction.reportID), 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
+        lodashGet(getReport(moneyRequestReportID), 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
         CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
         false,
         '',
@@ -2727,6 +2799,18 @@ function canAccessReport(report, policies, betas, allReportActions) {
 
     return true;
 }
+/**
+ * Check if the report is the parent report of the currently viewed report or at least one child report has report action
+ * @param {Object} report
+ * @param {String} currentReportId
+ * @returns {Boolean}
+ */
+function shouldHideReport(report, currentReportId) {
+    const parentReport = getParentReport(getReport(currentReportId));
+    const reportActions = ReportActionsUtils.getAllReportActions(report.reportID);
+    const isChildReportHasComment = _.some(reportActions, (reportAction) => (reportAction.childVisibleActionCount || 0) > 0);
+    return parentReport.reportID !== report.reportID && !isChildReportHasComment;
+}
 
 /**
  * Takes several pieces of data from Onyx and evaluates if a report should be shown in the option list (either when searching
@@ -2754,7 +2838,13 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
         !report ||
         !report.reportID ||
         report.isHidden ||
-        (_.isEmpty(report.participantAccountIDs) && !isChatThread(report) && !isPublicRoom(report) && !isArchivedRoom(report) && !isMoneyRequestReport(report) && !isTaskReport(report))
+        (report.participantAccountIDs &&
+            report.participantAccountIDs.length === 0 &&
+            !isChatThread(report) &&
+            !isPublicRoom(report) &&
+            !isArchivedRoom(report) &&
+            !isMoneyRequestReport(report) &&
+            !isTaskReport(report))
     ) {
         return false;
     }
@@ -2774,12 +2864,12 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
     if (report.hasDraft || isWaitingForIOUActionFromCurrentUser(report) || isWaitingForTaskCompleteFromAssignee(report)) {
         return true;
     }
-
     const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(report.reportID);
-    const isEmptyChat = !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+    const isEmptyChat = !report.lastMessageText && !report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+    const canHideReport = shouldHideReport(report, currentReportId);
 
     // Hide only chat threads that haven't been commented on (other threads are actionable)
-    if (isChatThread(report) && isEmptyChat) {
+    if (isChatThread(report) && canHideReport && isEmptyChat) {
         return false;
     }
 
@@ -2790,7 +2880,7 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
 
     // Include reports that have errors from trying to add a workspace
     // If we excluded it, then the red-brock-road pattern wouldn't work for the user to resolve the error
-    if (report.errorFields && !_.isEmpty(report.errorFields.addWorkspaceRoom)) {
+    if (report.errorFields && report.errorFields.addWorkspaceRoom) {
         return true;
     }
 
@@ -2805,7 +2895,7 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
     }
 
     // Hide chats between two users that haven't been commented on from the LNH
-    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report)) {
+    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report) && canHideReport) {
         return false;
     }
 
@@ -3064,8 +3154,8 @@ function getMoneyRequestOptions(report, reportParticipants, betas) {
         return [];
     }
 
-    // Additional requests should be blocked for money request reports
-    if (isMoneyRequestReport(report)) {
+    // Additional requests should be blocked for money request reports if it is approved or reimbursed
+    if (isMoneyRequestReport(report) && (isReportApproved(report) || isSettled(report.reportID))) {
         return [];
     }
 
@@ -3572,6 +3662,7 @@ export {
     shouldDisableSettings,
     shouldDisableRename,
     hasSingleParticipant,
+    getReportRecipientAccountIDs,
     isOneOnOneChat,
     getTransactionReportName,
     getTransactionDetails,
@@ -3581,4 +3672,5 @@ export {
     areAllRequestsBeingSmartScanned,
     getReportPreviewDisplayTransactions,
     getTransactionsWithReceipts,
+    hasMissingSmartscanFields,
 };
diff --git a/src/libs/Request.js b/src/libs/Request.ts
similarity index 53%
rename from src/libs/Request.js
rename to src/libs/Request.ts
index 577dcf3cb85d..459deaf89e1e 100644
--- a/src/libs/Request.js
+++ b/src/libs/Request.ts
@@ -1,43 +1,29 @@
-import _ from 'underscore';
 import HttpUtils from './HttpUtils';
 import enhanceParameters from './Network/enhanceParameters';
 import * as NetworkStore from './Network/NetworkStore';
+import Request from '../types/onyx/Request';
 
-let middlewares = [];
+type Middleware = (response: unknown, request: Request, isFromSequentialQueue: boolean) => Promise<unknown>;
 
-/**
- * @param {Object} request
- * @param {String} request.command
- * @param {Object} request.data
- * @param {String} request.type
- * @param {Boolean} request.shouldUseSecure
- * @returns {Promise}
- */
-function makeXHR(request) {
-    const finalParameters = enhanceParameters(request.command, request.data);
+let middlewares: Middleware[] = [];
+
+function makeXHR(request: Request): Promise<unknown> {
+    const finalParameters = enhanceParameters(request.command, request?.data ?? {});
     return NetworkStore.hasReadRequiredDataFromStorage().then(() => {
         // If we're using the Supportal token and this is not a Supportal request
         // let's just return a promise that will resolve itself.
         if (NetworkStore.getSupportAuthToken() && !NetworkStore.isSupportRequest(request.command)) {
-            return new Promise((resolve) => resolve());
+            return new Promise<void>((resolve) => resolve());
         }
         return HttpUtils.xhr(request.command, finalParameters, request.type, request.shouldUseSecure);
     });
 }
 
-/**
- * @param {Object} request
- * @param {Boolean} [isFromSequentialQueue]
- * @returns {Promise}
- */
-function processWithMiddleware(request, isFromSequentialQueue = false) {
-    return _.reduce(middlewares, (last, middleware) => middleware(last, request, isFromSequentialQueue), makeXHR(request));
+function processWithMiddleware(request: Request, isFromSequentialQueue = false): Promise<unknown> {
+    return middlewares.reduce((last, middleware) => middleware(last, request, isFromSequentialQueue), makeXHR(request));
 }
 
-/**
- * @param {Function} middleware
- */
-function use(middleware) {
+function use(middleware: Middleware) {
     middlewares.push(middleware);
 }
 
diff --git a/src/libs/RequestThrottle.js b/src/libs/RequestThrottle.ts
similarity index 64%
rename from src/libs/RequestThrottle.js
rename to src/libs/RequestThrottle.ts
index 4725a3ad5c38..8f9a85dcedb5 100644
--- a/src/libs/RequestThrottle.js
+++ b/src/libs/RequestThrottle.ts
@@ -1,5 +1,5 @@
-import _ from 'underscore';
 import CONST from '../CONST';
+import {generateRandomInt} from './NumberUtils';
 
 let requestWaitTime = 0;
 
@@ -7,22 +7,16 @@ function clear() {
     requestWaitTime = 0;
 }
 
-/**
- * @returns {Number} time to wait in ms
- */
 function getRequestWaitTime() {
     if (requestWaitTime) {
         requestWaitTime = Math.min(requestWaitTime * 2, CONST.NETWORK.MAX_RETRY_WAIT_TIME_MS);
     } else {
-        requestWaitTime = _.random(CONST.NETWORK.MIN_RETRY_WAIT_TIME_MS, CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS);
+        requestWaitTime = generateRandomInt(CONST.NETWORK.MIN_RETRY_WAIT_TIME_MS, CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS);
     }
     return requestWaitTime;
 }
 
-/**
- * @returns {Promise}
- */
-function sleep() {
+function sleep(): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, getRequestWaitTime()));
 }
 
diff --git a/src/libs/RoomNameInputUtils.js b/src/libs/RoomNameInputUtils.ts
similarity index 82%
rename from src/libs/RoomNameInputUtils.js
rename to src/libs/RoomNameInputUtils.ts
index 15b85f9f651a..2777acee45dd 100644
--- a/src/libs/RoomNameInputUtils.js
+++ b/src/libs/RoomNameInputUtils.ts
@@ -2,11 +2,8 @@ import CONST from '../CONST';
 
 /**
  * Replaces spaces with dashes
- *
- * @param {String} roomName
- * @returns {String}
  */
-function modifyRoomName(roomName) {
+function modifyRoomName(roomName: string): string {
     const modifiedRoomNameWithoutHash = roomName
         .replace(/ /g, '-')
 
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 118035f9f605..f645697690e6 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -1,7 +1,7 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import lodashOrderBy from 'lodash/orderBy';
 import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 import * as ReportUtils from './ReportUtils';
@@ -75,6 +75,22 @@ function setIsSidebarLoadedReady() {
     resolveSidebarIsReadyPromise();
 }
 
+// Define a cache object to store the memoized results
+const reportIDsCache = new Map();
+
+// Function to set a key-value pair while maintaining the maximum key limit
+function setWithLimit(map, key, value) {
+    if (map.size >= 5) {
+        // If the map has reached its limit, remove the first (oldest) key-value pair
+        const firstKey = map.keys().next().value;
+        map.delete(firstKey);
+    }
+    map.set(key, value);
+}
+
+// Variable to verify if ONYX actions are loaded
+let hasInitialReportActions = false;
+
 /**
  * @param {String} currentReportId
  * @param {Object} allReportsDict
@@ -85,22 +101,46 @@ function setIsSidebarLoadedReady() {
  * @returns {String[]} An array of reportIDs sorted in the proper order
  */
 function getOrderedReportIDs(currentReportId, allReportsDict, betas, policies, priorityMode, allReportActions) {
+    // Generate a unique cache key based on the function arguments
+    const cachedReportsKey = JSON.stringify(
+        // eslint-disable-next-line es/no-optional-chaining
+        [currentReportId, allReportsDict, betas, policies, priorityMode, allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportId}`]?.length || 1],
+        (key, value) => {
+            /**
+             *  Exclude 'participantAccountIDs', 'participants' and 'lastMessageText' not to overwhelm a cached key value with huge data,
+             *  which we don't need to store in a cacheKey
+             */
+            if (key === 'participantAccountIDs' || key === 'participants' || key === 'lastMessageText') {
+                return undefined;
+            }
+            return value;
+        },
+    );
+
+    // Check if the result is already in the cache
+    if (reportIDsCache.has(cachedReportsKey) && hasInitialReportActions) {
+        return reportIDsCache.get(cachedReportsKey);
+    }
+
+    // This is needed to prevent caching when Onyx is empty for a second render
+    hasInitialReportActions = Object.values(lastReportActions).length > 0;
+
     const isInGSDMode = priorityMode === CONST.PRIORITY_MODE.GSD;
     const isInDefaultMode = !isInGSDMode;
-
+    const allReportsDictValues = Object.values(allReportsDict);
     // Filter out all the reports that shouldn't be displayed
-    const reportsToDisplay = _.filter(allReportsDict, (report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas, policies, allReportActions, true));
+    const reportsToDisplay = allReportsDictValues.filter((report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas, policies, allReportActions, true));
 
-    if (_.isEmpty(reportsToDisplay)) {
+    if (reportsToDisplay.length === 0) {
         // Display Concierge chat report when there is no report to be displayed
-        const conciergeChatReport = _.find(allReportsDict, ReportUtils.isConciergeChatReport);
+        const conciergeChatReport = allReportsDictValues.find(ReportUtils.isConciergeChatReport);
         if (conciergeChatReport) {
             reportsToDisplay.push(conciergeChatReport);
         }
     }
 
     // There are a few properties that need to be calculated for the report which are used when sorting reports.
-    _.each(reportsToDisplay, (report) => {
+    reportsToDisplay.forEach((report) => {
         // Normally, the spread operator would be used here to clone the report and prevent the need to reassign the params.
         // However, this code needs to be very performant to handle thousands of reports, so in the interest of speed, we're just going to disable this lint rule and add
         // the reportDisplayName property to the report object directly.
@@ -121,52 +161,45 @@ function getOrderedReportIDs(currentReportId, allReportsDict, betas, policies, p
     // 5. Archived reports
     //      - Sorted by lastVisibleActionCreated in default (most recent) view mode
     //      - Sorted by reportDisplayName in GSD (focus) view mode
-    let pinnedReports = [];
-    let outstandingIOUReports = [];
-    let draftReports = [];
-    let nonArchivedReports = [];
-    let archivedReports = [];
-    _.each(reportsToDisplay, (report) => {
+    const pinnedReports = [];
+    const outstandingIOUReports = [];
+    const draftReports = [];
+    const nonArchivedReports = [];
+    const archivedReports = [];
+    reportsToDisplay.forEach((report) => {
         if (report.isPinned) {
             pinnedReports.push(report);
-            return;
-        }
-
-        if (ReportUtils.isWaitingForIOUActionFromCurrentUser(report)) {
+        } else if (ReportUtils.isWaitingForIOUActionFromCurrentUser(report)) {
             outstandingIOUReports.push(report);
-            return;
-        }
-
-        if (report.hasDraft) {
+        } else if (report.hasDraft) {
             draftReports.push(report);
-            return;
-        }
-
-        if (ReportUtils.isArchivedRoom(report)) {
+        } else if (ReportUtils.isArchivedRoom(report)) {
             archivedReports.push(report);
-            return;
+        } else {
+            nonArchivedReports.push(report);
         }
-
-        nonArchivedReports.push(report);
     });
 
     // Sort each group of reports accordingly
-    pinnedReports = _.sortBy(pinnedReports, (report) => report.displayName.toLowerCase());
-    outstandingIOUReports = lodashOrderBy(outstandingIOUReports, ['iouReportAmount', (report) => report.displayName.toLowerCase()], ['desc', 'asc']);
-    draftReports = _.sortBy(draftReports, (report) => report.displayName.toLowerCase());
-    nonArchivedReports = isInDefaultMode
-        ? lodashOrderBy(nonArchivedReports, ['lastVisibleActionCreated', (report) => report.displayName.toLowerCase()], ['desc', 'asc'])
-        : lodashOrderBy(nonArchivedReports, [(report) => report.displayName.toLowerCase()], ['asc']);
-    archivedReports = _.sortBy(archivedReports, (report) => (isInDefaultMode ? report.lastVisibleActionCreated : report.displayName.toLowerCase()));
-
-    // For archived reports ensure that most recent reports are at the top by reversing the order of the arrays because underscore will only sort them in ascending order
+    pinnedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+    outstandingIOUReports.sort((a, b) => b.iouReportAmount - a.iouReportAmount || a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+    draftReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
     if (isInDefaultMode) {
-        archivedReports.reverse();
+        nonArchivedReports.sort(
+            (a, b) => new Date(b.lastVisibleActionCreated) - new Date(a.lastVisibleActionCreated) || a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()),
+        );
+        // For archived reports ensure that most recent reports are at the top by reversing the order
+        archivedReports.sort((a, b) => new Date(a.lastVisibleActionCreated) - new Date(b.lastVisibleActionCreated));
+    } else {
+        nonArchivedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+        archivedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
     }
 
     // Now that we have all the reports grouped and sorted, they must be flattened into an array and only return the reportID.
     // The order the arrays are concatenated in matters and will determine the order that the groups are displayed in the sidebar.
-    return _.pluck([].concat(pinnedReports).concat(outstandingIOUReports).concat(draftReports).concat(nonArchivedReports).concat(archivedReports), 'reportID');
+    const LHNReports = [].concat(pinnedReports, outstandingIOUReports, draftReports, nonArchivedReports, archivedReports).map((report) => report.reportID);
+    setWithLimit(reportIDsCache, cachedReportsKey, LHNReports);
+    return LHNReports;
 }
 
 /**
@@ -205,7 +238,6 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
         statusNum: null,
         stateNum: null,
         phoneNumber: null,
-        payPalMeAddress: null,
         isUnread: null,
         isUnreadWithMention: null,
         hasDraftComment: false,
@@ -345,7 +377,6 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
         result.accountID = personalDetail.accountID;
         result.login = personalDetail.login;
         result.phoneNumber = personalDetail.phoneNumber;
-        result.payPalMeAddress = personalDetail.payPalMeAddress;
     }
 
     const reportName = ReportUtils.getReportName(report, policy);
diff --git a/src/libs/StartupTimer/index.js b/src/libs/StartupTimer/index.js
deleted file mode 100644
index 7b53266e50d9..000000000000
--- a/src/libs/StartupTimer/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Web noop as there is no "startup" to time from the native layer.
- */
-
-export default {
-    stop() {},
-};
diff --git a/src/libs/StartupTimer/index.native.js b/src/libs/StartupTimer/index.native.js
deleted file mode 100644
index 29bbef8cfe3d..000000000000
--- a/src/libs/StartupTimer/index.native.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {NativeModules} from 'react-native';
-
-/**
- * Stop the startup trace for the app.
- */
-function stop() {
-    NativeModules.StartupTimer.stop();
-}
-
-export default {
-    stop,
-};
diff --git a/src/libs/StartupTimer/index.native.ts b/src/libs/StartupTimer/index.native.ts
new file mode 100644
index 000000000000..52ba55076fc1
--- /dev/null
+++ b/src/libs/StartupTimer/index.native.ts
@@ -0,0 +1,13 @@
+import {NativeModules} from 'react-native';
+import StartupTimer from './types';
+
+/**
+ * Stop the startup trace for the app.
+ */
+const startupTimer: StartupTimer = {
+    stop: () => {
+        NativeModules.StartupTimer.stop();
+    },
+};
+
+export default startupTimer;
diff --git a/src/libs/StartupTimer/index.ts b/src/libs/StartupTimer/index.ts
new file mode 100644
index 000000000000..421524a70fc8
--- /dev/null
+++ b/src/libs/StartupTimer/index.ts
@@ -0,0 +1,11 @@
+/**
+ * Web noop as there is no "startup" to time from the native layer.
+ */
+
+import StartupTimer from './types';
+
+const startupTimer: StartupTimer = {
+    stop: () => {},
+};
+
+export default startupTimer;
diff --git a/src/libs/StartupTimer/types.ts b/src/libs/StartupTimer/types.ts
new file mode 100644
index 000000000000..e382fc267933
--- /dev/null
+++ b/src/libs/StartupTimer/types.ts
@@ -0,0 +1,5 @@
+type StartupTimer = {
+    stop: () => void;
+};
+
+export default StartupTimer;
diff --git a/src/libs/StringUtils.js b/src/libs/StringUtils.js
deleted file mode 100644
index 8219f9e8077f..000000000000
--- a/src/libs/StringUtils.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import _ from 'lodash';
-import CONST from '../CONST';
-/**
- * Removes diacritical marks and non-alphabetic and non-latin characters from a string.
- * @param {String} str - The input string to be sanitized.
- * @returns {String} The sanitized string
- */
-function sanitizeString(str) {
-    return _.chain(str).deburr().toLower().value().replaceAll(CONST.REGEX.NON_ALPHABETIC_AND_NON_LATIN_CHARS, '');
-}
-
-export default {sanitizeString};
diff --git a/src/libs/StringUtils.ts b/src/libs/StringUtils.ts
new file mode 100644
index 000000000000..8ef23bb0751b
--- /dev/null
+++ b/src/libs/StringUtils.ts
@@ -0,0 +1,13 @@
+import _ from 'lodash';
+import CONST from '../CONST';
+
+/**
+ * Removes diacritical marks and non-alphabetic and non-latin characters from a string.
+ * @param str - The input string to be sanitized.
+ * @returns The sanitized string
+ */
+function sanitizeString(str: string): string {
+    return _.deburr(str).toLowerCase().replaceAll(CONST.REGEX.NON_ALPHABETIC_AND_NON_LATIN_CHARS, '');
+}
+
+export default {sanitizeString};
diff --git a/src/libs/Timers.js b/src/libs/Timers.ts
similarity index 73%
rename from src/libs/Timers.js
rename to src/libs/Timers.ts
index 49bc6a7350b8..21ee2a8c2914 100644
--- a/src/libs/Timers.js
+++ b/src/libs/Timers.ts
@@ -1,14 +1,9 @@
-import _ from 'underscore';
-
-const timers = [];
+const timers: NodeJS.Timer[] = [];
 
 /**
  * Register a timer so it can be cleaned up later.
- *
- * @param {Number} timerID
- * @returns {Number}
  */
-function register(timerID) {
+function register(timerID: NodeJS.Timer): NodeJS.Timer {
     timers.push(timerID);
     return timerID;
 }
@@ -16,8 +11,8 @@ function register(timerID) {
 /**
  * Clears all timers that we have registered. Use for long running tasks that may begin once logged out.
  */
-function clearAll() {
-    _.each(timers, (timer) => {
+function clearAll(): void {
+    timers.forEach((timer) => {
         // We don't know whether it's a setTimeout or a setInterval, but it doesn't really matter. If the id doesn't
         // exist nothing bad happens.
         clearTimeout(timer);
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 7fb07f216f5f..70583175f115 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -33,6 +33,8 @@ Onyx.connect({
  * @param {Object} [receipt]
  * @param {String} [filename]
  * @param {String} [existingTransactionID] When creating a distance request, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have it's transactionID match what was already generated.
+ * @param {String} [category]
+ * @param {Boolean} [billable]
  * @returns {Object}
  */
 function buildOptimisticTransaction(
@@ -47,6 +49,8 @@ function buildOptimisticTransaction(
     receipt = {},
     filename = '',
     existingTransactionID = null,
+    category = '',
+    billable = false,
 ) {
     // transactionIDs are random, positive, 64-bit numeric strings.
     // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
@@ -74,6 +78,8 @@ function buildOptimisticTransaction(
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,
         filename,
+        category,
+        billable,
     };
 }
 
@@ -85,6 +91,21 @@ function hasReceipt(transaction) {
     return lodashGet(transaction, 'receipt.state', '') !== '';
 }
 
+/**
+ * @param {Object} transaction
+ * @returns {Boolean}
+ */
+function areRequiredFieldsEmpty(transaction) {
+    return (
+        transaction.modifiedMerchant === CONST.TRANSACTION.UNKNOWN_MERCHANT ||
+        transaction.modifiedMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT ||
+        (transaction.modifiedMerchant === '' &&
+            (transaction.merchant === CONST.TRANSACTION.UNKNOWN_MERCHANT || transaction.merchant === '' || transaction.merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT)) ||
+        (transaction.modifiedAmount === 0 && transaction.amount === 0) ||
+        (transaction.modifiedCreated === '' && transaction.created === '')
+    );
+}
+
 /**
  * Given the edit made to the money request, return an updated transaction object.
  *
@@ -126,6 +147,7 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
     if (shouldStopSmartscan && _.has(transaction, 'receipt') && !_.isEmpty(transaction.receipt) && lodashGet(transaction, 'receipt.state') !== CONST.IOU.RECEIPT_STATE.OPEN) {
         updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
     }
+
     updatedTransaction.pendingFields = {
         ...(_.has(transactionChanges, 'comment') && {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
         ...(_.has(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
@@ -142,6 +164,7 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
  *
  * @param {String} transactionID
  * @returns {Object}
+ * @deprecated Use withOnyx() or Onyx.connect() instead
  */
 function getTransaction(transactionID) {
     return lodashGet(allTransactions, `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {});
@@ -212,6 +235,16 @@ function getMerchant(transaction) {
     return lodashGet(transaction, 'modifiedMerchant', null) || lodashGet(transaction, 'merchant', '');
 }
 
+/**
+ * Return the category from the transaction. This "category" field has no "modified" complement.
+ *
+ * @param {Object} transaction
+ * @return {String}
+ */
+function getCategory(transaction) {
+    return lodashGet(transaction, 'category', '');
+}
+
 /**
  * Return the created field from the transaction, return the modifiedCreated if present.
  *
@@ -228,12 +261,51 @@ function getCreated(transaction) {
     return '';
 }
 
+/*
+ * @param {Object} transaction
+ * @param {Object} transaction.comment
+ * @param {String} transaction.comment.type
+ * @param {Object} [transaction.comment.customUnit]
+ * @param {String} [transaction.comment.customUnit.name]
+ * @returns {Boolean}
+ */
+function isDistanceRequest(transaction) {
+    const type = lodashGet(transaction, 'comment.type');
+    const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
+    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
+}
+
+function isReceiptBeingScanned(transaction) {
+    return _.contains([CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING], transaction.receipt.state);
+}
+
+/**
+ * Check if the transaction has a non-smartscanning receipt and is missing required fields
+ *
+ * @param {Object} transaction
+ * @returns {Boolean}
+ */
+function hasMissingSmartscanFields(transaction) {
+    return hasReceipt(transaction) && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction);
+}
+
+/**
+ * Check if the transaction has a defined route
+ *
+ * @param {Object} transaction
+ * @returns {Boolean}
+ */
+function hasRoute(transaction) {
+    return !!lodashGet(transaction, 'routes.route0.geometry.coordinates');
+}
+
 /**
  * Get the transactions related to a report preview with receipts
  * Get the details linked to the IOU reportAction
  *
  * @param {Object} reportAction
  * @returns {Object}
+ * @deprecated Use Onyx.connect() or withOnyx() instead
  */
 function getLinkedTransaction(reportAction = {}) {
     const transactionID = lodashGet(reportAction, ['originalMessage', 'IOUTransactionID'], '');
@@ -241,56 +313,72 @@ function getLinkedTransaction(reportAction = {}) {
 }
 
 function getAllReportTransactions(reportID) {
-    return _.filter(allTransactions, (transaction) => transaction.reportID === reportID);
+    // `reportID` from the `/CreateDistanceRequest` endpoint return's number instead of string for created `transaction`.
+    // For reference, https://github.com/Expensify/App/pull/26536#issuecomment-1703573277.
+    // We will update this in a follow-up Issue. According to this comment: https://github.com/Expensify/App/pull/26536#issuecomment-1703591019.
+    return _.filter(allTransactions, (transaction) => `${transaction.reportID}` === `${reportID}`);
 }
 
-function isReceiptBeingScanned(transaction) {
-    return transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
+/**
+ * Checks if a waypoint has a valid address
+ * @param {Object} waypoint
+ * @returns {Boolean} Returns true if the address is valid
+ */
+function waypointHasValidAddress(waypoint) {
+    if (!waypoint || !waypoint.address || typeof waypoint.address !== 'string' || waypoint.address.trim() === '') {
+        return false;
+    }
+    return true;
 }
 
 /**
- * Verifies that the provided waypoints are valid
- * @param {Object} waypoints
- * @returns {Boolean}
+ * Converts the key of a waypoint to its index
+ * @param {String} key
+ * @returns {Number} waypoint index
  */
-function validateWaypoints(waypoints) {
-    const waypointValues = _.values(waypoints);
+function getWaypointIndex(key) {
+    return Number(key.replace('waypoint', ''));
+}
 
+/**
+ * Filters the waypoints which are valid and returns those
+ * @param {Object} waypoints
+ * @param {Boolean} reArrangeIndexes
+ * @returns {Object} validated waypoints
+ */
+function getValidWaypoints(waypoints, reArrangeIndexes = false) {
+    const sortedIndexes = _.map(_.keys(waypoints), (key) => getWaypointIndex(key)).sort();
+    const waypointValues = _.map(sortedIndexes, (index) => waypoints[`waypoint${index}`]);
     // Ensure the number of waypoints is between 2 and 25
     if (waypointValues.length < 2 || waypointValues.length > 25) {
-        return false;
+        return {};
     }
 
-    for (let i = 0; i < waypointValues.length; i++) {
-        const currentWaypoint = waypointValues[i];
-        const previousWaypoint = waypointValues[i - 1];
+    let lastWaypointIndex = -1;
 
-        // Check if the waypoint has a valid address
-        if (!currentWaypoint || !currentWaypoint.address || typeof currentWaypoint.address !== 'string' || currentWaypoint.address.trim() === '') {
-            return false;
-        }
+    const validWaypoints = _.reduce(
+        waypointValues,
+        (acc, currentWaypoint, index) => {
+            const previousWaypoint = waypointValues[lastWaypointIndex];
+            // Check if the waypoint has a valid address
+            if (!waypointHasValidAddress(currentWaypoint)) {
+                return acc;
+            }
 
-        // Check for adjacent waypoints with the same address
-        if (previousWaypoint && currentWaypoint.address === previousWaypoint.address) {
-            return false;
-        }
-    }
+            // Check for adjacent waypoints with the same address
+            if (previousWaypoint && currentWaypoint.address === previousWaypoint.address) {
+                return acc;
+            }
 
-    return true;
-}
+            const validatedWaypoints = {...acc, [`waypoint${reArrangeIndexes ? lastWaypointIndex + 1 : index}`]: currentWaypoint};
 
-/*
- * @param {Object} transaction
- * @param {Object} transaction.comment
- * @param {String} transaction.comment.type
- * @param {Object} [transaction.comment.customUnit]
- * @param {String} [transaction.comment.customUnit.name]
- * @returns {Boolean}
- */
-function isDistanceRequest(transaction) {
-    const type = lodashGet(transaction, 'comment.type');
-    const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
-    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
+            lastWaypointIndex += 1;
+
+            return validatedWaypoints;
+        },
+        {},
+    );
+    return validWaypoints;
 }
 
 export {
@@ -302,10 +390,15 @@ export {
     getCurrency,
     getMerchant,
     getCreated,
+    getCategory,
     getLinkedTransaction,
     getAllReportTransactions,
     hasReceipt,
+    hasRoute,
     isReceiptBeingScanned,
-    validateWaypoints,
+    getValidWaypoints,
     isDistanceRequest,
+    hasMissingSmartscanFields,
+    getWaypointIndex,
+    waypointHasValidAddress,
 };
diff --git a/src/libs/Trie/TrieNode.js b/src/libs/Trie/TrieNode.js
deleted file mode 100644
index 27597f861620..000000000000
--- a/src/libs/Trie/TrieNode.js
+++ /dev/null
@@ -1,9 +0,0 @@
-class TrieNode {
-    constructor() {
-        this.children = {};
-        this.isEndOfWord = false;
-        this.metaData = {};
-    }
-}
-
-export default TrieNode;
diff --git a/src/libs/Trie/TrieNode.ts b/src/libs/Trie/TrieNode.ts
new file mode 100644
index 000000000000..645ce6747cbb
--- /dev/null
+++ b/src/libs/Trie/TrieNode.ts
@@ -0,0 +1,19 @@
+type MetaData = Record<string, unknown>;
+
+class TrieNode<TMetadata extends MetaData> {
+    children: Record<string, TrieNode<TMetadata>>;
+
+    metaData: Partial<TMetadata>;
+
+    isEndOfWord: boolean;
+
+    constructor() {
+        this.children = {};
+        this.metaData = {};
+        this.isEndOfWord = false;
+    }
+}
+
+export default TrieNode;
+
+export type {MetaData};
diff --git a/src/libs/Trie/index.js b/src/libs/Trie/index.ts
similarity index 62%
rename from src/libs/Trie/index.js
rename to src/libs/Trie/index.ts
index 085f62ab4ef5..c3c5aa4bbf3f 100644
--- a/src/libs/Trie/index.js
+++ b/src/libs/Trie/index.ts
@@ -1,19 +1,23 @@
-import _ from 'underscore';
-import TrieNode from './TrieNode';
+import TrieNode, {MetaData} from './TrieNode';
+
+type Word<TMetaData extends MetaData> = {
+    name: string;
+    metaData: Partial<TMetaData>;
+};
+
+class Trie<TMetaData extends MetaData> {
+    root: TrieNode<TMetaData>;
 
-class Trie {
     constructor() {
         this.root = new TrieNode();
     }
 
     /**
      * Add a word to the Trie
-     * @param {String} word
-     * @param {Object} [metaData] - attach additional data to the word
-     * @param {TrieNode} [node]
-     * @param {Boolean} [allowEmptyWords] - empty word doesn't have any char, you shouldn't pass a true value for it because we are disallowing adding an empty word
+     * @param [metaData] - attach additional data to the word
+     * @param [allowEmptyWords] - empty word doesn't have any char, you shouldn't pass a true value for it because we are disallowing adding an empty word
      */
-    add(word, metaData = {}, node = this.root, allowEmptyWords = false) {
+    add(word: string, metaData: Partial<TMetaData> = {}, node = this.root, allowEmptyWords = false) {
         const newWord = word.toLowerCase();
         const newNode = node;
         if (newWord.length === 0 && !allowEmptyWords) {
@@ -33,10 +37,9 @@ class Trie {
 
     /**
      * Search for a word in the Trie.
-     * @param {String} word
-     * @returns {Object|null} – the node for the word if it's found, or null if it's not found
+     * @returns - the node for the word if it's found, or null if it's not found
      */
-    search(word) {
+    search(word: string): TrieNode<TMetaData> | null {
         let newWord = word.toLowerCase();
         let node = this.root;
         while (newWord.length > 1) {
@@ -52,10 +55,8 @@ class Trie {
 
     /**
      * Update a word data in the Trie.
-     * @param {String} word
-     * @param {Object} metaData
      */
-    update(word, metaData) {
+    update(word: string, metaData: TMetaData) {
         let newWord = word.toLowerCase();
         let node = this.root;
         while (newWord.length > 1) {
@@ -70,33 +71,26 @@ class Trie {
 
     /**
      * Find all leaf nodes starting with a substring.
-     * @param {String} substr
-     * @param {Number} [limit] - matching words limit
-     * @returns {Array}
+     * @param [limit] - matching words limit
      */
-    getAllMatchingWords(substr, limit = 5) {
+    getAllMatchingWords(substr: string, limit = 5): Array<Word<TMetaData>> {
         const newSubstr = substr.toLowerCase();
         let node = this.root;
         let prefix = '';
-        for (let i = 0; i < newSubstr.length; i++) {
-            prefix += newSubstr[i];
-            if (!node.children[newSubstr[i]]) {
+        for (const char of newSubstr) {
+            prefix += char;
+            if (!node.children[char]) {
                 return [];
             }
-            node = node.children[newSubstr[i]];
+            node = node.children[char];
         }
         return this.getChildMatching(node, prefix, limit, []);
     }
 
     /**
      * Find all leaf nodes that are descendants of a given child node.
-     * @param {TrieNode} node
-     * @param {String} prefix
-     * @param {Number} limit
-     * @param {Array} [words]
-     * @returns {Array}
      */
-    getChildMatching(node, prefix, limit, words = []) {
+    getChildMatching(node: TrieNode<TMetaData>, prefix: string, limit: number, words: Array<Word<TMetaData>> = []): Array<Word<TMetaData>> {
         const matching = words;
         if (matching.length >= limit) {
             return matching;
@@ -104,9 +98,9 @@ class Trie {
         if (node.isEndOfWord) {
             matching.push({name: prefix, metaData: node.metaData});
         }
-        const children = _.keys(node.children);
-        for (let i = 0; i < children.length; i++) {
-            this.getChildMatching(node.children[children[i]], prefix + children[i], limit, matching);
+        const children = Object.keys(node.children);
+        for (const child of children) {
+            this.getChildMatching(node.children[child], prefix + child, limit, matching);
         }
         return matching;
     }
diff --git a/src/libs/Url.js b/src/libs/Url.ts
similarity index 65%
rename from src/libs/Url.js
rename to src/libs/Url.ts
index eb96b697a8fc..a21f007e8468 100644
--- a/src/libs/Url.js
+++ b/src/libs/Url.ts
@@ -1,10 +1,9 @@
 import 'react-native-url-polyfill/auto';
+
 /**
  * Add / to the end of any URL if not present
- * @param {String} url
- * @returns {String}
  */
-function addTrailingForwardSlash(url) {
+function addTrailingForwardSlash(url: string): string {
     if (!url.endsWith('/')) {
         return `${url}/`;
     }
@@ -13,10 +12,8 @@ function addTrailingForwardSlash(url) {
 
 /**
  * Get path from URL string
- * @param {String} url
- * @returns {String}
  */
-function getPathFromURL(url) {
+function getPathFromURL(url: string): string {
     try {
         const parsedUrl = new URL(url);
         const path = parsedUrl.pathname + parsedUrl.search + parsedUrl.hash;
@@ -29,12 +26,9 @@ function getPathFromURL(url) {
 
 /**
  * Determine if two urls have the same origin
- * @param {String} url1
- * @param {String} url2
- * @returns {Boolean}
  */
-function hasSameExpensifyOrigin(url1, url2) {
-    const removeW3 = (host) => host.replace(/^www\./i, '');
+function hasSameExpensifyOrigin(url1: string, url2: string): boolean {
+    const removeW3 = (host: string) => host.replace(/^www\./i, '');
     try {
         const parsedUrl1 = new URL(url1);
         const parsedUrl2 = new URL(url2);
@@ -47,9 +41,4 @@ function hasSameExpensifyOrigin(url1, url2) {
     }
 }
 
-export {
-    // eslint-disable-next-line import/prefer-default-export
-    addTrailingForwardSlash,
-    hasSameExpensifyOrigin,
-    getPathFromURL,
-};
+export {addTrailingForwardSlash, hasSameExpensifyOrigin, getPathFromURL};
diff --git a/src/libs/UserUtils.js b/src/libs/UserUtils.js
index 918c2c9bbdc6..2d5930b0dfd8 100644
--- a/src/libs/UserUtils.js
+++ b/src/libs/UserUtils.js
@@ -106,9 +106,8 @@ function getDefaultAvatarURL(accountID = '', isNewDot = false) {
         return CONST.CONCIERGE_ICON_URL;
     }
 
-    // The default avatar for a user is based on a simple hash of their accountID.
     // Note that Avatar count starts at 1 which is why 1 has to be added to the result (or else 0 would result in a broken avatar link)
-    const accountIDHashBucket = hashText(String(accountID), isNewDot ? CONST.DEFAULT_AVATAR_COUNT : CONST.OLD_DEFAULT_AVATAR_COUNT) + 1;
+    const accountIDHashBucket = (Number(accountID) % (isNewDot ? CONST.DEFAULT_AVATAR_COUNT : CONST.OLD_DEFAULT_AVATAR_COUNT)) + 1;
     const avatarPrefix = isNewDot ? `default-avatar` : `avatar`;
 
     return `${CONST.CLOUDFRONT_URL}/images/avatars/${avatarPrefix}_${accountIDHashBucket}.png`;
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 81b91e2101be..7aded82fb0a9 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -1,4 +1,4 @@
-import {subYears, addYears, startOfDay, endOfMonth, isAfter, isBefore, isValid, isWithinInterval, isSameDay, format} from 'date-fns';
+import {subYears, addYears, startOfDay, endOfMonth, parse, isAfter, isBefore, isValid, isWithinInterval, isSameDay, format} from 'date-fns';
 import _ from 'underscore';
 import {URL_REGEX_WITH_REQUIRED_PROTOCOL} from 'expensify-common/lib/Url';
 import {parsePhoneNumber} from 'awesome-phonenumber';
@@ -190,15 +190,6 @@ function isValidSSNFullNine(ssnFull9) {
     return CONST.REGEX.SSN_FULL_NINE.test(ssnFull9);
 }
 
-/**
- *
- * @param {String} paypalUsername
- * @returns {Boolean}
- */
-function isValidPaypalUsername(paypalUsername) {
-    return Boolean(paypalUsername) && CONST.REGEX.PAYPAL_ME_USERNAME.test(paypalUsername);
-}
-
 /**
  * Validate that a date meets the minimum age requirement.
  *
@@ -233,19 +224,24 @@ function meetsMaximumAgeRequirement(date) {
  */
 function getAgeRequirementError(date, minimumAge, maximumAge) {
     const currentDate = startOfDay(new Date());
-    const recentDate = subYears(currentDate, minimumAge);
-    const longAgoDate = subYears(currentDate, maximumAge);
-    const testDate = new Date(date);
+    const testDate = parse(date, CONST.DATE.FNS_FORMAT_STRING, currentDate);
+
     if (!isValid(testDate)) {
         return 'common.error.dateInvalid';
     }
-    if (isWithinInterval(testDate, {start: longAgoDate, end: recentDate})) {
+
+    const maximalDate = subYears(currentDate, minimumAge);
+    const minimalDate = subYears(currentDate, maximumAge);
+
+    if (isWithinInterval(testDate, {start: minimalDate, end: maximalDate})) {
         return '';
     }
-    if (isSameDay(testDate, recentDate) || isAfter(testDate, recentDate)) {
-        return ['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(recentDate, CONST.DATE.FNS_FORMAT_STRING)}];
+
+    if (isSameDay(testDate, maximalDate) || isAfter(testDate, maximalDate)) {
+        return ['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(maximalDate, CONST.DATE.FNS_FORMAT_STRING)}];
     }
-    return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(longAgoDate, CONST.DATE.FNS_FORMAT_STRING)}];
+
+    return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(minimalDate, CONST.DATE.FNS_FORMAT_STRING)}];
 }
 
 /**
@@ -475,7 +471,6 @@ export {
     validateIdentity,
     isValidTwoFactorCode,
     isNumericWithSpecialChars,
-    isValidPaypalUsername,
     isValidRoutingNumber,
     isValidSSNLastFour,
     isValidSSNFullNine,
diff --git a/src/libs/VisualViewport/index.native.js b/src/libs/VisualViewport/index.native.ts
similarity index 50%
rename from src/libs/VisualViewport/index.native.js
rename to src/libs/VisualViewport/index.native.ts
index c228119b064c..a50b080d9aab 100644
--- a/src/libs/VisualViewport/index.native.js
+++ b/src/libs/VisualViewport/index.native.ts
@@ -1,10 +1,8 @@
+import AddViewportResizeListener from './types';
+
 /**
  * Visual Viewport is not available on native, so return an empty function.
- *
- * @returns {Function}
  */
-function addViewportResizeListener() {
-    return () => {};
-}
+const addViewportResizeListener: AddViewportResizeListener = () => () => {};
 
 export default addViewportResizeListener;
diff --git a/src/libs/VisualViewport/index.js b/src/libs/VisualViewport/index.ts
similarity index 55%
rename from src/libs/VisualViewport/index.js
rename to src/libs/VisualViewport/index.ts
index cc6be038209c..e24d42f272a4 100644
--- a/src/libs/VisualViewport/index.js
+++ b/src/libs/VisualViewport/index.ts
@@ -1,16 +1,15 @@
+import AddViewportResizeListener from './types';
+
 /**
  * Add a visual viewport resize listener if available. Return a function to remove the listener.
- *
- * @param {Function} onViewportResize
- * @returns {Function}
  */
-function addViewportResizeListener(onViewportResize) {
+const addViewportResizeListener: AddViewportResizeListener = (onViewportResize) => {
     if (!window.visualViewport) {
         return () => {};
     }
 
     window.visualViewport.addEventListener('resize', onViewportResize);
-    return () => window.visualViewport.removeEventListener('resize', onViewportResize);
-}
+    return () => window.visualViewport?.removeEventListener('resize', onViewportResize);
+};
 
 export default addViewportResizeListener;
diff --git a/src/libs/VisualViewport/types.ts b/src/libs/VisualViewport/types.ts
new file mode 100644
index 000000000000..da8360d72a35
--- /dev/null
+++ b/src/libs/VisualViewport/types.ts
@@ -0,0 +1,3 @@
+type AddViewportResizeListener = (onViewportResize: (e: Event) => void) => () => void;
+
+export default AddViewportResizeListener;
diff --git a/src/libs/actions/ActiveClients.js b/src/libs/actions/ActiveClients.ts
similarity index 69%
rename from src/libs/actions/ActiveClients.js
rename to src/libs/actions/ActiveClients.ts
index 744944cfef1c..45fcff402f49 100644
--- a/src/libs/actions/ActiveClients.js
+++ b/src/libs/actions/ActiveClients.ts
@@ -1,11 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Array} activeClients
- * @return {Promise}
- */
-function setActiveClients(activeClients) {
+function setActiveClients(activeClients: string[]): Promise<void> {
     return Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
 }
 
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 6028e0468696..a9c3f8775cba 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -1,4 +1,3 @@
-import moment from 'moment-timezone';
 import {AppState} from 'react-native';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -18,7 +17,6 @@ import * as Session from './Session';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 import Timing from './Timing';
 import * as Browser from '../Browser';
-import * as SequentialQueue from '../Network/SequentialQueue';
 
 let currentUserAccountID;
 let currentUserEmail;
@@ -208,6 +206,35 @@ function reconnectApp(updateIDFrom = 0) {
     });
 }
 
+/**
+ * Fetches data when the app will call reconnectApp without params for the last time. This is a separate function
+ * because it will follow patterns that are not recommended so we can be sure we're not putting the app in a unusable
+ * state because of race conditions between reconnectApp and other pusher updates being applied at the same time.
+ * @return {Promise}
+ */
+function finalReconnectAppAfterActivatingReliableUpdates() {
+    console.debug(`[OnyxUpdates] Executing last reconnect app with promise`);
+    return getPolicyParamsForOpenOrReconnect().then((policyParams) => {
+        const params = {...policyParams};
+
+        // When the app reconnects we do a fast "sync" of the LHN and only return chats that have new messages. We achieve this by sending the most recent reportActionID.
+        // we have locally. And then only update the user about chats with messages that have occurred after that reportActionID.
+        //
+        // - Look through the local report actions and reports to find the most recently modified report action or report.
+        // - We send this to the server so that it can compute which new chats the user needs to see and return only those as an optimization.
+        Timing.start(CONST.TIMING.CALCULATE_MOST_RECENT_LAST_MODIFIED_ACTION);
+        params.mostRecentReportActionLastModified = ReportActionsUtils.getMostRecentReportActionLastModified();
+        Timing.end(CONST.TIMING.CALCULATE_MOST_RECENT_LAST_MODIFIED_ACTION, '', 500);
+
+        // It is SUPER BAD FORM to return promises from action methods.
+        // DO NOT FOLLOW THIS PATTERN!!!!!
+        // It was absolutely necessary in order to not break the app while migrating to the new reliable updates pattern. This method will be removed
+        // as soon as we have everyone migrated to the reliableUpdate beta.
+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        return API.makeRequestWithSideEffects('ReconnectApp', params, getOnyxDataForOpenOrReconnect());
+    });
+}
+
 /**
  * Fetches data when the client has discovered it missed some Onyx updates from the server
  * @param {Number} [updateIDFrom] the ID of the Onyx update that we want to start fetching from
@@ -231,48 +258,6 @@ function getMissingOnyxUpdates(updateIDFrom = 0, updateIDTo = 0) {
     );
 }
 
-// The next 40ish lines of code are used for detecting when there is a gap of OnyxUpdates between what was last applied to the client and the updates the server has.
-// When a gap is detected, the missing updates are fetched from the API.
-
-// These key needs to be separate from ONYXKEYS.ONYX_UPDATES_FROM_SERVER so that it can be updated without triggering the callback when the server IDs are updated
-let lastUpdateIDAppliedToClient = 0;
-Onyx.connect({
-    key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
-    callback: (val) => (lastUpdateIDAppliedToClient = val),
-});
-
-Onyx.connect({
-    key: ONYXKEYS.ONYX_UPDATES_FROM_SERVER,
-    callback: (val) => {
-        if (!val) {
-            return;
-        }
-
-        const {lastUpdateIDFromServer, previousUpdateIDFromServer} = val;
-        console.debug('[OnyxUpdates] Received lastUpdateID from server', lastUpdateIDFromServer);
-        console.debug('[OnyxUpdates] Received previousUpdateID from server', previousUpdateIDFromServer);
-        console.debug('[OnyxUpdates] Last update ID applied to the client', lastUpdateIDAppliedToClient);
-
-        // If the previous update from the server does not match the last update the client got, then the client is missing some updates.
-        // getMissingOnyxUpdates will fetch updates starting from the last update this client got and going to the last update the server sent.
-        if (lastUpdateIDAppliedToClient && previousUpdateIDFromServer && lastUpdateIDAppliedToClient < previousUpdateIDFromServer) {
-            console.debug('[OnyxUpdates] Gap detected in update IDs so fetching incremental updates');
-            Log.info('Gap detected in update IDs from server so fetching incremental updates', true, {
-                lastUpdateIDFromServer,
-                previousUpdateIDFromServer,
-                lastUpdateIDAppliedToClient,
-            });
-            SequentialQueue.pause();
-            getMissingOnyxUpdates(lastUpdateIDAppliedToClient, lastUpdateIDFromServer).finally(SequentialQueue.unpause);
-        }
-
-        if (lastUpdateIDFromServer > lastUpdateIDAppliedToClient) {
-            // Update this value so that it matches what was just received from the server
-            Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, lastUpdateIDFromServer || 0);
-        }
-    },
-});
-
 /**
  * This promise is used so that deeplink component know when a transition is end.
  * This is necessary because we want to begin deeplink redirection after the transition is end.
@@ -399,7 +384,7 @@ function openProfile(personalDetails) {
     if (lodashGet(oldTimezoneData, 'automatic', true)) {
         newTimezoneData = {
             automatic: true,
-            selected: moment.tz.guess(true),
+            selected: Intl.DateTimeFormat().resolvedOptions().timeZone,
         };
     }
 
@@ -453,6 +438,15 @@ function beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount = true) {
 
     // eslint-disable-next-line rulesdir/no-api-side-effects-method
     API.makeRequestWithSideEffects('OpenOldDotLink', {shouldRetry: false}, {}).then((response) => {
+        if (!response) {
+            Log.alert(
+                'Trying to redirect via deep link, but the response is empty. User likely not authenticated.',
+                {response, shouldAuthenticateWithCurrentAccount, currentUserAccountID},
+                true,
+            );
+            return;
+        }
+
         Browser.openRouteInDesktopApp(response.shortLivedAuthToken, currentUserEmail);
     });
 }
@@ -484,4 +478,6 @@ export {
     beginDeepLinkRedirect,
     beginDeepLinkRedirectAfterTransition,
     createWorkspaceAndNavigateToIt,
+    getMissingOnyxUpdates,
+    finalReconnectAppAfterActivatingReliableUpdates,
 };
diff --git a/src/libs/actions/AppUpdate.js b/src/libs/actions/AppUpdate.ts
similarity index 78%
rename from src/libs/actions/AppUpdate.js
rename to src/libs/actions/AppUpdate.ts
index 502ef9762252..f0e3c1c3da20 100644
--- a/src/libs/actions/AppUpdate.js
+++ b/src/libs/actions/AppUpdate.ts
@@ -5,10 +5,7 @@ function triggerUpdateAvailable() {
     Onyx.set(ONYXKEYS.UPDATE_AVAILABLE, true);
 }
 
-/**
- * @param {Boolean} isBeta
- */
-function setIsAppInBeta(isBeta) {
+function setIsAppInBeta(isBeta: boolean) {
     Onyx.set(ONYXKEYS.IS_BETA, isBeta);
 }
 
diff --git a/src/libs/actions/Composer.js b/src/libs/actions/Composer.ts
similarity index 69%
rename from src/libs/actions/Composer.js
rename to src/libs/actions/Composer.ts
index 9a75e3662cd8..d3f9ef9814a5 100644
--- a/src/libs/actions/Composer.js
+++ b/src/libs/actions/Composer.ts
@@ -1,10 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Boolean} shouldShowComposeInput
- */
-function setShouldShowComposeInput(shouldShowComposeInput) {
+function setShouldShowComposeInput(shouldShowComposeInput: boolean) {
     Onyx.set(ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT, shouldShowComposeInput);
 }
 
diff --git a/src/libs/actions/CurrentDate.js b/src/libs/actions/CurrentDate.ts
similarity index 74%
rename from src/libs/actions/CurrentDate.js
rename to src/libs/actions/CurrentDate.ts
index 078b35a760cb..b19a3430e96f 100644
--- a/src/libs/actions/CurrentDate.js
+++ b/src/libs/actions/CurrentDate.ts
@@ -1,10 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {String} currentDate
- */
-function setCurrentDate(currentDate) {
+function setCurrentDate(currentDate: string) {
     Onyx.set(ONYXKEYS.CURRENT_DATE, currentDate);
 }
 
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
deleted file mode 100644
index aa2b43824f91..000000000000
--- a/src/libs/actions/DemoActions.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import CONST from '../../CONST';
-import * as API from '../API';
-import * as ReportUtils from '../ReportUtils';
-import Navigation from '../Navigation/Navigation';
-import ROUTES from '../../ROUTES';
-import ONYXKEYS from '../../ONYXKEYS';
-import * as Localize from '../Localize';
-
-/**
- * @param {String} workspaceOwnerEmail email of the workspace owner
- * @param {String} apiCommand
- */
-function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
-    // Try to navigate to existing demo workspace expense chat if it exists in Onyx
-    const demoWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(workspaceOwnerEmail);
-    if (demoWorkspaceChatReportID) {
-        // We must call goBack() to remove the demo route from nav history
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(demoWorkspaceChatReportID));
-        return;
-    }
-
-    // We use makeRequestWithSideEffects here because we need to get the workspace chat report ID to navigate to it after it's created
-    // eslint-disable-next-line rulesdir/no-api-side-effects-method
-    API.makeRequestWithSideEffects(apiCommand).then((response) => {
-        // Get report updates from Onyx response data
-        const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT);
-        if (!reportUpdate) {
-            return;
-        }
-
-        // Get the policy expense chat update
-        const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-        if (!policyExpenseChatReport) {
-            return;
-        }
-
-        // Navigate to the new policy expense chat report
-        // Note: We must call goBack() to remove the demo route from history
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID));
-    });
-}
-
-function runSbeDemo() {
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, 'CreateSbeDemoWorkspace');
-}
-
-function runSaastrDemo() {
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SAASTR, 'CreateSaastrDemoWorkspace');
-}
-
-/**
- * Runs code for specific demos, based on the provided URL
- *
- * @param {String} url - URL user is navigating to via deep link (or regular link in web)
- */
-function runDemoByURL(url = '') {
-    const cleanUrl = (url || '').toLowerCase();
-
-    if (cleanUrl.endsWith(ROUTES.SAASTR)) {
-        Onyx.set(ONYXKEYS.DEMO_INFO, {
-            saastr: {
-                isBeginningDemo: true,
-            },
-        });
-    } else if (cleanUrl.endsWith(ROUTES.SBE)) {
-        Onyx.set(ONYXKEYS.DEMO_INFO, {
-            sbe: {
-                isBeginningDemo: true,
-            },
-        });
-    } else {
-        // No demo is being run, so clear out demo info
-        Onyx.set(ONYXKEYS.DEMO_INFO, null);
-    }
-}
-
-function getHeadlineKeyByDemoInfo(demoInfo = {}) {
-    if (lodashGet(demoInfo, 'saastr.isBeginningDemo')) {
-        return Localize.translateLocal('demos.saastr.signInWelcome');
-    }
-    if (lodashGet(demoInfo, 'sbe.isBeginningDemo')) {
-        return Localize.translateLocal('demos.sbe.signInWelcome');
-    }
-    return '';
-}
-
-export {runSaastrDemo, runSbeDemo, runDemoByURL, getHeadlineKeyByDemoInfo};
diff --git a/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js b/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
index a02178cbc0a3..bb66f3fe7a9b 100644
--- a/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
+++ b/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
@@ -1,8 +1,8 @@
-import {version} from '../../../../../package.json';
+import packageConfig from '../../../../../package.json';
 
 export default function getBaseInfo() {
     return {
-        app_version: version,
+        app_version: packageConfig.version,
         timestamp: new Date().toISOString().slice(0, 19),
     };
 }
diff --git a/src/libs/actions/Download.js b/src/libs/actions/Download.ts
similarity index 63%
rename from src/libs/actions/Download.js
rename to src/libs/actions/Download.ts
index 41e3cb136e3a..06b97d735d39 100644
--- a/src/libs/actions/Download.js
+++ b/src/libs/actions/Download.ts
@@ -1,15 +1,10 @@
-import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
 /**
  * Set whether an attachment is being downloaded so that a spinner can be shown.
- *
- * @param {String} sourceID
- * @param {Boolean} isDownloading
- * @returns {Promise}
  */
-function setDownload(sourceID, isDownloading) {
+function setDownload(sourceID: string, isDownloading: boolean): Promise<void> {
     return Onyx.merge(`${ONYXKEYS.COLLECTION.DOWNLOAD}${sourceID}`, {isDownloading});
 }
 
@@ -19,9 +14,12 @@ function clearDownloads() {
         waitForCollectionCallback: true,
         callback: (records) => {
             Onyx.disconnect(connectionID);
-            const downloadsToDelete = {};
-            _.each(_.keys(records), (recordKey) => (downloadsToDelete[recordKey] = null));
-            if (!_.isEmpty(downloadsToDelete)) {
+            const downloadsToDelete: Record<string, null> = {};
+            Object.keys(records ?? {}).forEach((recordKey) => {
+                downloadsToDelete[recordKey] = null;
+            });
+
+            if (Object.keys(downloadsToDelete).length > 0) {
                 Onyx.multiSet(downloadsToDelete);
             }
         },
diff --git a/src/libs/actions/DownloadAppModal.js b/src/libs/actions/DownloadAppModal.js
deleted file mode 100644
index 5dc2d3fdca22..000000000000
--- a/src/libs/actions/DownloadAppModal.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../../ONYXKEYS';
-
-/**
- * @param {Boolean} shouldShowBanner
- */
-function setShowDownloadAppModal(shouldShowBanner) {
-    Onyx.set(ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER, shouldShowBanner);
-}
-
-export default setShowDownloadAppModal;
diff --git a/src/libs/actions/EmojiPickerAction.js b/src/libs/actions/EmojiPickerAction.js
index 84621af3a5b4..70c7ebabbe20 100644
--- a/src/libs/actions/EmojiPickerAction.js
+++ b/src/libs/actions/EmojiPickerAction.js
@@ -45,6 +45,13 @@ function isActive(id) {
     return emojiPickerRef.current.isActive(id);
 }
 
+function clearActive() {
+    if (!emojiPickerRef.current) {
+        return;
+    }
+    return emojiPickerRef.current.clearActive();
+}
+
 function isEmojiPickerVisible() {
     if (!emojiPickerRef.current) {
         return;
@@ -59,4 +66,4 @@ function resetEmojiPopoverAnchor() {
     return emojiPickerRef.current.resetEmojiPopoverAnchor();
 }
 
-export {emojiPickerRef, showEmojiPicker, hideEmojiPicker, isActive, isEmojiPickerVisible, resetEmojiPopoverAnchor};
+export {emojiPickerRef, showEmojiPicker, hideEmojiPicker, isActive, clearActive, isEmojiPickerVisible, resetEmojiPopoverAnchor};
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index bf00a030c115..587b2392deba 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -8,7 +8,6 @@ import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
 import Navigation from '../Navigation/Navigation';
 import * as Localize from '../Localize';
-import asyncOpenURL from '../asyncOpenURL';
 import * as API from '../API';
 import * as ReportUtils from '../ReportUtils';
 import * as CurrencyUtils from '../CurrencyUtils';
@@ -21,6 +20,8 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as UserUtils from '../UserUtils';
 import * as Report from './Report';
 import * as NumberUtils from '../NumberUtils';
+import ReceiptGeneric from '../../../assets/images/receipt-generic.png';
+import * as LocalePhoneNumber from '../LocalePhoneNumber';
 
 let allReports;
 Onyx.connect({
@@ -43,10 +44,19 @@ Onyx.connect({
     },
 });
 
+let allRecentlyUsedCategories = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allRecentlyUsedCategories = val),
+});
+
 let userAccountID = '';
+let currentUserEmail = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
+        currentUserEmail = lodashGet(val, 'email', '');
         userAccountID = lodashGet(val, 'accountID', '');
     },
 });
@@ -78,11 +88,16 @@ function resetMoneyRequestInfo(id = '') {
         amount: 0,
         currency: lodashGet(currentUserPersonalDetails, 'localCurrencyCode', CONST.CURRENCY.USD),
         comment: '',
+        // TODO: remove participants after all instances of iou.participants will be replaced with iou.participantAccountIDs
         participants: [],
+        participantAccountIDs: [],
         merchant: CONST.TRANSACTION.DEFAULT_MERCHANT,
+        category: '',
         created,
         receiptPath: '',
         receiptSource: '',
+        transactionID: '',
+        billable: null,
     });
 }
 
@@ -95,6 +110,7 @@ function buildOnyxDataForMoneyRequest(
     iouAction,
     optimisticPersonalDetailListAction,
     reportPreviewAction,
+    optimisticRecentlyUsedCategories,
     isNewChatReport,
     isNewIOUReport,
 ) {
@@ -144,6 +160,14 @@ function buildOnyxDataForMoneyRequest(
         },
     ];
 
+    if (!_.isEmpty(optimisticRecentlyUsedCategories)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`,
+            value: optimisticRecentlyUsedCategories,
+        });
+    }
+
     if (!_.isEmpty(optimisticPersonalDetailListAction)) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
@@ -312,9 +336,12 @@ function buildOnyxDataForMoneyRequest(
  * @param {String} currency
  * @param {String} created
  * @param {String} merchant
- * @param {Number} payeeAccountID
- * @param {String} payeeEmail
+ * @param {Number} [payeeAccountID]
+ * @param {String} [payeeEmail]
  * @param {Object} [receipt]
+ * @param {String} [existingTransactionID]
+ * @param {String} [category]
+ * @param {Boolean} [billable]
  * @returns {Object} data
  * @returns {String} data.payerEmail
  * @returns {Object} data.iouReport
@@ -328,9 +355,22 @@ function buildOnyxDataForMoneyRequest(
  * @returns {Object} data.onyxData.optimisticData
  * @returns {Object} data.onyxData.successData
  * @returns {Object} data.onyxData.failureData
- * @param {String} [existingTransactionID]
  */
-function getMoneyRequestInformation(report, participant, comment, amount, currency, created, merchant, payeeAccountID, payeeEmail, receipt = undefined, existingTransactionID = null) {
+function getMoneyRequestInformation(
+    report,
+    participant,
+    comment,
+    amount,
+    currency,
+    created,
+    merchant,
+    payeeAccountID = userAccountID,
+    payeeEmail = currentUserEmail,
+    receipt = undefined,
+    existingTransactionID = undefined,
+    category = undefined,
+    billable = undefined,
+) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
@@ -379,7 +419,7 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
     let filename;
     if (receipt && receipt.source) {
         receiptObject.source = receipt.source;
-        receiptObject.state = CONST.IOU.RECEIPT_STATE.SCANREADY;
+        receiptObject.state = receipt.state || CONST.IOU.RECEIPT_STATE.SCANREADY;
         filename = receipt.name;
     }
     let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(
@@ -394,8 +434,18 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
         receiptObject,
         filename,
         existingTransactionID,
+        category,
+        billable,
     );
 
+    const uniquePolicyRecentlyUsedCategories = allRecentlyUsedCategories
+        ? _.filter(
+              allRecentlyUsedCategories[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`],
+              (recentlyUsedPolicyCategory) => recentlyUsedPolicyCategory !== category,
+          )
+        : [];
+    const optimisticPolicyRecentlyUsedCategories = [category, ...uniquePolicyRecentlyUsedCategories];
+
     // If there is an existing transaction (which is the case for distance requests), then the data from the existing transaction
     // needs to be manually merged into the optimistic transaction. This is because buildOnyxDataForMoneyRequest() uses `Onyx.set()` for the transaction
     // data. This is a big can of worms to change it to `Onyx.merge()` as explored in https://expensify.slack.com/archives/C05DWUDHVK7/p1692139468252109.
@@ -433,9 +483,13 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
     if (reportPreviewAction) {
-        reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, comment, optimisticTransaction);
+        reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
     } else {
         reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport, comment, optimisticTransaction);
+
+        // Generated ReportPreview action is a parent report action of the iou report.
+        // We are setting the iou report's parentReportActionID to display subtitle correctly in IOU page when offline.
+        iouReport.parentReportActionID = reportPreviewAction.reportActionID;
     }
 
     // Add optimistic personal details for participant
@@ -444,7 +498,7 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
               [payerAccountID]: {
                   accountID: payerAccountID,
                   avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                  displayName: participant.displayName || payerEmail,
+                  displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || payerEmail),
                   login: participant.login,
               },
           }
@@ -460,6 +514,7 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
         iouAction,
         optimisticPersonalDetailListAction,
         reportPreviewAction,
+        optimisticPolicyRecentlyUsedCategories,
         isNewChatReport,
         isNewIOUReport,
     );
@@ -485,36 +540,37 @@ function getMoneyRequestInformation(report, participant, comment, amount, curren
  * Requests money based on a distance (eg. mileage from a map)
  *
  * @param {Object} report
- * @param {String} payeeEmail
- * @param {Number} payeeAccountID
  * @param {Object} participant
  * @param {String} comment
- * @param {Object[]} waypoints
- * @param {String} waypoints[].address required and must be non empty
- * @param {String} [waypoints[].lat] optional
- * @param {String} [waypoints[].lng] optional
  * @param {String} created
  * @param {String} [transactionID]
+ * @param {String} [category]
+ * @param {Number} amount
+ * @param {String} currency
+ * @param {String} merchant
  */
-function createDistanceRequest(report, payeeEmail, payeeAccountID, participant, comment, waypoints, created, transactionID) {
-    const {payerEmail, iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
+function createDistanceRequest(report, participant, comment, created, transactionID, category, amount, currency, merchant) {
+    const optimisticReceipt = {
+        source: ReceiptGeneric,
+        state: CONST.IOU.RECEIPT_STATE.OPEN,
+    };
+    const {iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
         report,
         participant,
         comment,
-        0,
-        'USD',
+        amount,
+        currency,
         created,
-        '',
-        payeeAccountID,
-        payeeEmail,
+        merchant,
+        null,
         null,
+        optimisticReceipt,
         transactionID,
+        category,
     );
-
     API.write(
         'CreateDistanceRequest',
         {
-            debtorEmail: payerEmail,
             comment,
             iouReportID: iouReport.reportID,
             chatReportID: chatReport.reportID,
@@ -523,11 +579,14 @@ function createDistanceRequest(report, payeeEmail, payeeAccountID, participant,
             createdChatReportActionID,
             createdIOUReportActionID,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
-            waypoints,
+            waypoints: JSON.stringify(TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true)),
             created,
+            category,
         },
         onyxData,
     );
+    Navigation.dismissModal(chatReport.reportID);
+    Report.notifyNewAction(chatReport.reportID, userAccountID);
 }
 
 /**
@@ -543,10 +602,15 @@ function createDistanceRequest(report, payeeEmail, payeeAccountID, participant,
  * @param {Object} participant
  * @param {String} comment
  * @param {Object} [receipt]
+ * @param {String} [category]
+ * @param {Boolean} [billable]
  */
-function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined) {
+function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined, category = undefined, billable = undefined) {
+    // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
+    const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
+    const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const {payerEmail, iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
-        report,
+        currentChatReport,
         participant,
         comment,
         amount,
@@ -556,6 +620,9 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
         payeeAccountID,
         payeeEmail,
         receipt,
+        undefined,
+        category,
+        billable,
     );
 
     API.write(
@@ -575,11 +642,13 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
             createdIOUReportActionID,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             receipt,
+            category,
+            billable,
         },
         onyxData,
     );
     resetMoneyRequestInfo();
-    Navigation.dismissModal(chatReport.reportID);
+    Navigation.dismissModal(isMoneyRequestReport ? report.reportID : chatReport.reportID);
     Report.notifyNewAction(chatReport.reportID, payeeAccountID);
 }
 
@@ -605,7 +674,7 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
  * @return {Object}
  */
 function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID = '') {
-    const currentUserEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(currentUserLogin);
+    const currentUserEmailForIOUSplit = OptionsListUtils.addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = _.map(participants, (participant) => Number(participant.accountID));
     const existingSplitChatReport = existingSplitChatReportID
         ? allReports[`${ONYXKEYS.COLLECTION.REPORT}${existingSplitChatReportID}`]
@@ -630,7 +699,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     );
 
     // Note: The created action must be optimistically generated before the IOU action so there's no chance that the created action appears after the IOU action in the chat
-    const splitCreatedReportAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail);
+    const splitCreatedReportAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmailForIOUSplit);
     const splitIOUReportAction = ReportUtils.buildOptimisticIOUReportAction(
         CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
         amount,
@@ -749,14 +818,14 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
     const splitAmount = IOUUtils.calculateAmount(participants.length, amount, currency, false);
-    const splits = [{email: currentUserEmail, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, currency, true)}];
+    const splits = [{email: currentUserEmailForIOUSplit, accountID: currentUserAccountID, amount: IOUUtils.calculateAmount(participants.length, amount, currency, true)}];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
         // In case the participant is a worskapce, email & accountID should remain undefined and won't be used in the rest of this code
         const email = isOwnPolicyExpenseChat ? '' : OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login).toLowerCase();
         const accountID = isOwnPolicyExpenseChat ? 0 : Number(participant.accountID);
-        if (email === currentUserEmail) {
+        if (email === currentUserEmailForIOUSplit) {
             return;
         }
 
@@ -815,8 +884,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         // 3. IOU action for the iouReport
         // 4. REPORTPREVIEW action for the chatReport
         // Note: The CREATED action for the IOU report must be optimistically generated before the IOU action so there's no chance that it appears after the IOU action in the chat
-        const oneOnOneCreatedActionForChat = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail);
-        const oneOnOneCreatedActionForIOU = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail);
+        const oneOnOneCreatedActionForChat = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmailForIOUSplit);
+        const oneOnOneCreatedActionForIOU = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmailForIOUSplit);
         const oneOnOneIOUAction = ReportUtils.buildOptimisticIOUReportAction(
             CONST.IOU.REPORT_ACTION_TYPE.CREATE,
             splitAmount,
@@ -834,7 +903,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
                   [accountID]: {
                       accountID,
                       avatar: UserUtils.getDefaultAvatarURL(accountID),
-                      displayName: participant.displayName || email,
+                      displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || email),
                       login: participant.login,
                   },
               }
@@ -857,6 +926,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOneIOUAction,
             oneOnOnePersonalDetailListAction,
             oneOnOneReportPreviewAction,
+            [],
             isNewOneOnOneChatReport,
             shouldCreateNewOneOnOneIOUReport,
         );
@@ -972,12 +1042,50 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
     const transactionThread = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`];
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread.parentReportID}`];
+    const chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`];
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
 
     // STEP 2: Build new modified expense report action.
     const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport);
     const updatedTransaction = TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport);
+
     // STEP 3: Compute the IOU total and update the report preview message so LHN amount owed is correct
+    // Should only update if the transaction matches the currency of the report, else we wait for the update
+    // from the server with the currency conversion
+    let updatedMoneyRequestReport = {...iouReport};
+    const updatedChatReport = {...chatReport};
+    const diff = TransactionUtils.getAmount(transaction, true) - TransactionUtils.getAmount(updatedTransaction, true);
+    if (updatedTransaction.currency === iouReport.currency && updatedTransaction.modifiedAmount && diff !== 0) {
+        if (ReportUtils.isExpenseReport(iouReport)) {
+            updatedMoneyRequestReport.total += diff;
+        } else {
+            updatedMoneyRequestReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, updatedReportAction.actorAccountID, diff, TransactionUtils.getCurrency(transaction), false);
+        }
+
+        updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedTransaction.currency);
+
+        // Update the last message of the IOU report
+        const lastMessage = ReportUtils.getIOUReportActionMessage(
+            iouReport.reportID,
+            CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+            updatedMoneyRequestReport.total,
+            '',
+            updatedTransaction.currency,
+            '',
+            false,
+        );
+        updatedMoneyRequestReport.lastMessageText = lastMessage[0].text;
+        updatedMoneyRequestReport.lastMessageHtml = lastMessage[0].html;
+
+        // Update the last message of the chat report
+        const messageText = Localize.translateLocal('iou.payerOwesAmount', {
+            payer: updatedMoneyRequestReport.managerEmail,
+            amount: CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedMoneyRequestReport.currency),
+        });
+        updatedChatReport.lastMessageText = messageText;
+        updatedChatReport.lastMessageHtml = messageText;
+    }
+
     // STEP 4: Compose the optimistic data
     const optimisticData = [
         {
@@ -992,6 +1100,16 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: updatedTransaction,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+            value: updatedMoneyRequestReport,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`,
+            value: updatedChatReport,
+        },
     ];
 
     const successData = [
@@ -1015,6 +1133,11 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+            value: {pendingAction: null},
+        },
     ];
 
     const failureData = [
@@ -1032,13 +1155,18 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.report}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: iouReport,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`,
+            value: chatReport,
+        },
     ];
 
     // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment, merchant} = ReportUtils.getTransactionDetails(updatedTransaction);
+    const {created, amount, currency, comment, merchant, category} = ReportUtils.getTransactionDetails(updatedTransaction);
     API.write(
         'EditMoneyRequest',
         {
@@ -1049,6 +1177,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             currency,
             comment,
             merchant,
+            category,
         },
         {optimisticData, successData, failureData},
     );
@@ -1274,16 +1403,6 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
     }
 }
 
-/**
- * @param {Number} amount
- * @param {String} submitterPayPalMeAddress
- * @param {String} currency
- * @returns {String}
- */
-function buildPayPalPaymentUrl(amount, submitterPayPalMeAddress, currency) {
-    return `https://paypal.me/${submitterPayPalMeAddress}/${Math.abs(amount) / 100}${currency}`;
-}
-
 /**
  * @param {Object} report
  * @param {Number} amount
@@ -1521,7 +1640,13 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
         true,
     );
 
-    const optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID));
+    // In some instances, the report preview action might not be available to the payer (only whispered to the requestor)
+    // hence we need to make the updates to the action safely.
+    let optimisticReportPreviewAction = null;
+    const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+    if (reportPreviewAction) {
+        optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
+    }
 
     const optimisticData = [
         {
@@ -1547,13 +1672,6 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
                 },
             },
         },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
-            value: {
-                [optimisticReportPreviewAction.reportActionID]: optimisticReportPreviewAction,
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
@@ -1594,7 +1712,18 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
                 },
             },
         },
-        {
+    ];
+
+    // In case the report preview action is loaded locally, let's update it.
+    if (optimisticReportPreviewAction) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
+            value: {
+                [optimisticReportPreviewAction.reportActionID]: optimisticReportPreviewAction,
+            },
+        });
+        failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
@@ -1602,8 +1731,8 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
                     created: optimisticReportPreviewAction.created,
                 },
             },
-        },
-    ];
+        });
+    }
 
     return {
         params: {
@@ -1654,26 +1783,6 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-/**
- * @param {Object} report
- * @param {Number} amount
- * @param {String} currency
- * @param {String} comment
- * @param {String} managerID - Account ID of the person sending the money
- * @param {Object} recipient - The user receiving the money
- */
-function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
-
-    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
-
-    resetMoneyRequestInfo();
-    Navigation.dismissModal(params.chatReportID);
-    Report.notifyNewAction(params.chatReportID, managerID);
-
-    asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(amount, recipient.payPalMeAddress, currency));
-}
-
 function approveMoneyRequest(expenseReport) {
     const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
 
@@ -1737,7 +1846,6 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
     const recipient = {
         login: iouReport.ownerEmail,
         accountID: iouReport.ownerAccountID,
-        payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
     const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
@@ -1747,9 +1855,6 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
 
     API.write(apiCommand, params, {optimisticData, successData, failureData});
     Navigation.dismissModal(chatReport.reportID);
-    if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
-        asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
-    }
 }
 
 /**
@@ -1804,11 +1909,31 @@ function setMoneyRequestMerchant(merchant) {
     Onyx.merge(ONYXKEYS.IOU, {merchant: merchant.trim()});
 }
 
+/**
+ * @param {String} category
+ */
+function setMoneyRequestCategory(category) {
+    Onyx.merge(ONYXKEYS.IOU, {category});
+}
+
+function resetMoneyRequestCategory() {
+    Onyx.merge(ONYXKEYS.IOU, {category: ''});
+}
+
+/**
+ * @param {Boolean} billable
+ */
+function setMoneyRequestBillable(billable) {
+    Onyx.merge(ONYXKEYS.IOU, {billable});
+}
+
 /**
  * @param {Object[]} participants
  */
 function setMoneyRequestParticipants(participants) {
-    Onyx.merge(ONYXKEYS.IOU, {participants});
+    // TODO: temporarily we want to save both participants and participantAccountIDs, then we can remove participants (and rename the function)
+    // more info: https://github.com/Expensify/App/issues/25714#issuecomment-1712924903 and https://github.com/Expensify/App/issues/25714#issuecomment-1716335802
+    Onyx.merge(ONYXKEYS.IOU, {participants, participantAccountIDs: _.map(participants, 'accountID')});
 }
 
 /**
@@ -1845,12 +1970,14 @@ function navigateToNextPage(iou, iouType, reportID, report) {
 
     // If a request is initiated on a report, skip the participants selection step and navigate to the confirmation page.
     if (report.reportID) {
+        // If the report is iou or expense report, we should get the chat report to set participant for request money
+        const chatReport = ReportUtils.isMoneyRequestReport(report) ? ReportUtils.getReport(report.chatReportID) : report;
         // Reinitialize the participants when the money request ID in Onyx does not match the ID from params
         if (_.isEmpty(iou.participants) || shouldReset) {
             const currentUserAccountID = currentUserPersonalDetails.accountID;
-            const participants = ReportUtils.isPolicyExpenseChat(report)
-                ? [{reportID: report.reportID, isPolicyExpenseChat: true, selected: true}]
-                : _.chain(report.participantAccountIDs)
+            const participants = ReportUtils.isPolicyExpenseChat(chatReport)
+                ? [{reportID: chatReport.reportID, isPolicyExpenseChat: true, selected: true}]
+                : _.chain(chatReport.participantAccountIDs)
                       .filter((accountID) => currentUserAccountID !== accountID)
                       .map((accountID) => ({accountID, selected: true}))
                       .value();
@@ -1870,7 +1997,6 @@ export {
     splitBillAndOpenReport,
     requestMoney,
     sendMoneyElsewhere,
-    sendMoneyViaPaypal,
     approveMoneyRequest,
     payMoneyRequest,
     sendMoneyWithWallet,
@@ -1882,6 +2008,9 @@ export {
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
     setMoneyRequestMerchant,
+    setMoneyRequestCategory,
+    resetMoneyRequestCategory,
+    setMoneyRequestBillable,
     setMoneyRequestParticipants,
     setMoneyRequestReceipt,
     createEmptyTransaction,
diff --git a/src/libs/actions/MapboxToken.js b/src/libs/actions/MapboxToken.js
index e1e643d0eabc..2ce56eb1a11e 100644
--- a/src/libs/actions/MapboxToken.js
+++ b/src/libs/actions/MapboxToken.js
@@ -140,12 +140,15 @@ const stop = () => {
     console.debug('[MapboxToken] Stopping all listeners and timers');
     if (connectionIDForToken) {
         Onyx.disconnect(connectionIDForToken);
+        connectionIDForToken = null;
     }
     if (connectionIDForNetwork) {
         Onyx.disconnect(connectionIDForNetwork);
+        connectionIDForNetwork = null;
     }
     if (appStateSubscription) {
         appStateSubscription.remove();
+        appStateSubscription = null;
     }
     clearTimeout(refreshTimeoutID);
 };
diff --git a/src/libs/actions/Modal.js b/src/libs/actions/Modal.ts
similarity index 74%
rename from src/libs/actions/Modal.js
rename to src/libs/actions/Modal.ts
index ea3bfc351593..ff09731f59a7 100644
--- a/src/libs/actions/Modal.js
+++ b/src/libs/actions/Modal.ts
@@ -1,25 +1,20 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-let closeModal;
-let onModalClose;
+let closeModal: (isNavigating: boolean) => void;
+let onModalClose: null | (() => void);
 
 /**
  * Allows other parts of the app to call modal close function
- *
- * @param {Function} [onClose]
  */
-function setCloseModal(onClose) {
+function setCloseModal(onClose: () => void) {
     closeModal = onClose;
 }
 
 /**
  * Close modal in other parts of the app
- *
- * @param {Function} [onModalCloseCallback]
- * @param {Boolean} isNavigating
  */
-function close(onModalCloseCallback, isNavigating = true) {
+function close(onModalCloseCallback: () => void, isNavigating = true) {
     if (!closeModal) {
         // If modal is already closed, no need to wait for modal close. So immediately call callback.
         if (onModalCloseCallback) {
@@ -42,20 +37,16 @@ function onModalDidClose() {
 
 /**
  * Allows other parts of the app to know when a modal has been opened or closed
- *
- * @param {Boolean} isVisible
  */
-function setModalVisibility(isVisible) {
+function setModalVisibility(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {isVisible});
 }
 
 /**
  * Allows other parts of app to know that an alert modal is about to open.
  * This will trigger as soon as a modal is opened but not yet visible while animation is running.
- *
- * @param {Boolean} isVisible
  */
-function willAlertModalBecomeVisible(isVisible) {
+function willAlertModalBecomeVisible(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible});
 }
 
diff --git a/src/libs/actions/Network.js b/src/libs/actions/Network.ts
similarity index 58%
rename from src/libs/actions/Network.js
rename to src/libs/actions/Network.ts
index 892ba92f6973..212e44f6782d 100644
--- a/src/libs/actions/Network.js
+++ b/src/libs/actions/Network.ts
@@ -1,26 +1,18 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Boolean} isOffline
- */
-function setIsOffline(isOffline) {
+function setIsOffline(isOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {isOffline});
 }
 
-/**
- *
- * @param {Boolean} shouldForceOffline
- */
-function setShouldForceOffline(shouldForceOffline) {
+function setShouldForceOffline(shouldForceOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldForceOffline});
 }
 
 /**
  * Test tool that will fail all network requests when enabled
- * @param {Boolean} shouldFailAllRequests
  */
-function setShouldFailAllRequests(shouldFailAllRequests) {
+function setShouldFailAllRequests(shouldFailAllRequests: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldFailAllRequests});
 }
 
diff --git a/src/libs/actions/OnyxUpdateManager.js b/src/libs/actions/OnyxUpdateManager.js
new file mode 100644
index 000000000000..e0f3f8fd4622
--- /dev/null
+++ b/src/libs/actions/OnyxUpdateManager.js
@@ -0,0 +1,96 @@
+import Onyx from 'react-native-onyx';
+import _ from 'underscore';
+import ONYXKEYS from '../../ONYXKEYS';
+import Log from '../Log';
+import * as SequentialQueue from '../Network/SequentialQueue';
+import * as App from './App';
+import * as OnyxUpdates from './OnyxUpdates';
+import CONST from '../../CONST';
+
+// This file is in charge of looking at the updateIDs coming from the server and comparing them to the last updateID that the client has.
+// If the client is behind the server, then we need to
+// 1. Pause all sequential queue requests
+// 2. Pause all Onyx updates from Pusher
+// 3. Get the missing updates from the server
+// 4. Apply those updates
+// 5. Apply the original update that triggered this request (it could have come from either HTTPS or Pusher)
+// 6. Restart the sequential queue
+// 7. Restart the Onyx updates from Pusher
+// This will ensure that the client is up-to-date with the server and all the updates have been applied in the correct order.
+// It's important that this file is separate and not imported by OnyxUpdates.js, so that there are no circular dependencies. Onyx
+// is used as a pub/sub mechanism to break out of the circular dependency.
+// The circular dependency happens because this file calls API.GetMissingOnyxUpdates() which uses the SaveResponseInOnyx.js file
+// (as a middleware). Therefore, SaveResponseInOnyx.js can't import and use this file directly.
+
+let lastUpdateIDAppliedToClient = 0;
+Onyx.connect({
+    key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
+    callback: (val) => (lastUpdateIDAppliedToClient = val),
+});
+
+export default () => {
+    console.debug('[OnyxUpdateManager] Listening for updates from the server');
+    Onyx.connect({
+        key: ONYXKEYS.ONYX_UPDATES_FROM_SERVER,
+        callback: (val) => {
+            if (!val) {
+                return;
+            }
+
+            // Since we used the same key that used to store another object, let's confirm that the current object is
+            // following the new format before we proceed. If it isn't, then let's clear the object in Onyx.
+            if (
+                !_.isObject(val) ||
+                !_.has(val, 'type') ||
+                (!(val.type === CONST.ONYX_UPDATE_TYPES.HTTPS && _.has(val, 'request') && _.has(val, 'response')) && !(val.type === CONST.ONYX_UPDATE_TYPES.PUSHER && _.has(val, 'updates')))
+            ) {
+                console.debug('[OnyxUpdateManager] Invalid format found for updates, cleaning and unpausing the queue');
+                Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
+                SequentialQueue.unpause();
+                return;
+            }
+
+            const updateParams = val;
+            const lastUpdateIDFromServer = val.lastUpdateID;
+            const previousUpdateIDFromServer = val.previousUpdateID;
+
+            // In cases where we received a previousUpdateID and it doesn't match our lastUpdateIDAppliedToClient
+            // we need to perform one of the 2 possible cases:
+            //
+            // 1. This is the first time we're receiving an lastUpdateID, so we need to do a final reconnectApp before
+            // fully migrating to the reliable updates mode.
+            // 2. This client already has the reliable updates mode enabled, but it's missing some updates and it
+            // needs to fetch those.
+            //
+            // For both of those, we need to pause the sequential queue. This is important so that the updates are
+            // applied in their correct and specific order. If this queue was not paused, then there would be a lot of
+            // onyx data being applied while we are fetching the missing updates and that would put them all out of order.
+            SequentialQueue.pause();
+            let canUnpauseQueuePromise;
+
+            // The flow below is setting the promise to a reconnect app to address flow (1) explained above.
+            if (!lastUpdateIDAppliedToClient) {
+                Log.info('Client has not gotten reliable updates before so reconnecting the app to start the process');
+
+                // Since this is a full reconnectApp, we'll not apply the updates we received - those will come in the reconnect app request.
+                canUnpauseQueuePromise = App.finalReconnectAppAfterActivatingReliableUpdates();
+            } else {
+                // The flow below is setting the promise to a getMissingOnyxUpdates to address flow (2) explained above.
+                console.debug(`[OnyxUpdateManager] Client is behind the server by ${previousUpdateIDFromServer - lastUpdateIDAppliedToClient} so fetching incremental updates`);
+                Log.info('Gap detected in update IDs from server so fetching incremental updates', true, {
+                    lastUpdateIDFromServer,
+                    previousUpdateIDFromServer,
+                    lastUpdateIDAppliedToClient,
+                });
+                canUnpauseQueuePromise = App.getMissingOnyxUpdates(lastUpdateIDAppliedToClient, lastUpdateIDFromServer);
+            }
+
+            canUnpauseQueuePromise.finally(() => {
+                OnyxUpdates.apply(updateParams).finally(() => {
+                    console.debug('[OnyxUpdateManager] Done applying all updates');
+                    SequentialQueue.unpause();
+                });
+            });
+        },
+    });
+};
diff --git a/src/libs/actions/OnyxUpdates.js b/src/libs/actions/OnyxUpdates.js
deleted file mode 100644
index e582016f0109..000000000000
--- a/src/libs/actions/OnyxUpdates.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../../ONYXKEYS';
-
-/**
- *
- * @param {Number} [lastUpdateID]
- * @param {Number} [previousUpdateID]
- */
-function saveUpdateIDs(lastUpdateID = 0, previousUpdateID = 0) {
-    // Return early if there were no updateIDs
-    if (!lastUpdateID) {
-        return;
-    }
-
-    Onyx.merge(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, {
-        lastUpdateIDFromServer: lastUpdateID,
-        previousUpdateIDFromServer: previousUpdateID,
-    });
-}
-
-// eslint-disable-next-line import/prefer-default-export
-export {saveUpdateIDs};
diff --git a/src/libs/actions/OnyxUpdates.ts b/src/libs/actions/OnyxUpdates.ts
new file mode 100644
index 000000000000..39a20ae9362a
--- /dev/null
+++ b/src/libs/actions/OnyxUpdates.ts
@@ -0,0 +1,109 @@
+import Onyx, {OnyxEntry} from 'react-native-onyx';
+import {Merge} from 'type-fest';
+import PusherUtils from '../PusherUtils';
+import ONYXKEYS from '../../ONYXKEYS';
+import * as QueuedOnyxUpdates from './QueuedOnyxUpdates';
+import CONST from '../../CONST';
+import {OnyxUpdatesFromServer, OnyxUpdateEvent, Request} from '../../types/onyx';
+import Response from '../../types/onyx/Response';
+
+// This key needs to be separate from ONYXKEYS.ONYX_UPDATES_FROM_SERVER so that it can be updated without triggering the callback when the server IDs are updated. If that
+// callback were triggered it would lead to duplicate processing of server updates.
+let lastUpdateIDAppliedToClient: OnyxEntry<number> = 0;
+Onyx.connect({
+    key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
+    callback: (val) => (lastUpdateIDAppliedToClient = val),
+});
+
+function applyHTTPSOnyxUpdates(request: Request, response: Response) {
+    console.debug('[OnyxUpdateManager] Applying https update');
+    // For most requests we can immediately update Onyx. For write requests we queue the updates and apply them after the sequential queue has flushed to prevent a replay effect in
+    // the UI. See https://github.com/Expensify/App/issues/12775 for more info.
+    const updateHandler = request?.data?.apiRequestType === CONST.API_REQUEST_TYPE.WRITE ? QueuedOnyxUpdates.queueOnyxUpdates : Onyx.update;
+
+    // First apply any onyx data updates that are being sent back from the API. We wait for this to complete and then
+    // apply successData or failureData. This ensures that we do not update any pending, loading, or other UI states contained
+    // in successData/failureData until after the component has received and API data.
+    const onyxDataUpdatePromise = response.onyxData ? updateHandler(response.onyxData) : Promise.resolve();
+
+    return onyxDataUpdatePromise
+        .then(() => {
+            // Handle the request's success/failure data (client-side data)
+            if (response.jsonCode === 200 && request.successData) {
+                return updateHandler(request.successData);
+            }
+            if (response.jsonCode !== 200 && request.failureData) {
+                return updateHandler(request.failureData);
+            }
+            return Promise.resolve();
+        })
+        .then(() => {
+            console.debug('[OnyxUpdateManager] Done applying HTTPS update');
+            return Promise.resolve(response);
+        });
+}
+
+function applyPusherOnyxUpdates(updates: OnyxUpdateEvent[]) {
+    console.debug('[OnyxUpdateManager] Applying pusher update');
+    const pusherEventPromises = updates.map((update) => PusherUtils.triggerMultiEventHandler(update.eventType, update.data));
+    return Promise.all(pusherEventPromises).then(() => {
+        console.debug('[OnyxUpdateManager] Done applying Pusher update');
+    });
+}
+
+/**
+ * @param [updateParams.request] Exists if updateParams.type === 'https'
+ * @param [updateParams.response] Exists if updateParams.type === 'https'
+ * @param [updateParams.updates] Exists if updateParams.type === 'pusher'
+ */
+function apply({lastUpdateID, type, request, response, updates}: Merge<OnyxUpdatesFromServer, {updates: OnyxUpdateEvent[]; type: 'pusher'}>): Promise<void>;
+function apply({lastUpdateID, type, request, response, updates}: Merge<OnyxUpdatesFromServer, {request: Request; response: Response; type: 'https'}>): Promise<Response>;
+function apply({lastUpdateID, type, request, response, updates}: OnyxUpdatesFromServer): Promise<void | Response> | undefined {
+    console.debug(`[OnyxUpdateManager] Applying update type: ${type} with lastUpdateID: ${lastUpdateID}`, {request, response, updates});
+
+    if (lastUpdateID && lastUpdateIDAppliedToClient && Number(lastUpdateID) < lastUpdateIDAppliedToClient) {
+        console.debug('[OnyxUpdateManager] Update received was older than current state, returning without applying the updates');
+        return Promise.resolve();
+    }
+    if (lastUpdateID && (lastUpdateIDAppliedToClient === null || Number(lastUpdateID) > lastUpdateIDAppliedToClient)) {
+        Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, Number(lastUpdateID));
+    }
+    if (type === CONST.ONYX_UPDATE_TYPES.HTTPS && request && response) {
+        return applyHTTPSOnyxUpdates(request, response);
+    }
+    if (type === CONST.ONYX_UPDATE_TYPES.PUSHER && updates) {
+        return applyPusherOnyxUpdates(updates);
+    }
+}
+
+/**
+ * @param [updateParams.request] Exists if updateParams.type === 'https'
+ * @param [updateParams.response] Exists if updateParams.type === 'https'
+ * @param [updateParams.updates] Exists if updateParams.type === 'pusher'
+ */
+function saveUpdateInformation(updateParams: OnyxUpdatesFromServer) {
+    // Always use set() here so that the updateParams are never merged and always unique to the request that came in
+    Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, updateParams);
+}
+
+/**
+ * This function will receive the previousUpdateID from any request/pusher update that has it, compare to our current app state
+ * and return if an update is needed
+ * @param previousUpdateID The previousUpdateID contained in the response object
+ */
+function doesClientNeedToBeUpdated(previousUpdateID = 0): boolean {
+    // If no previousUpdateID is sent, this is not a WRITE request so we don't need to update our current state
+    if (!previousUpdateID) {
+        return false;
+    }
+
+    // If we don't have any value in lastUpdateIDAppliedToClient, this is the first time we're receiving anything, so we need to do a last reconnectApp
+    if (!lastUpdateIDAppliedToClient) {
+        return true;
+    }
+
+    return lastUpdateIDAppliedToClient < previousUpdateID;
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export {saveUpdateInformation, doesClientNeedToBeUpdated, apply};
diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 95148c1d4367..17fec65078ed 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -4,18 +4,10 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
 import CONST from '../../CONST';
-import Growl from '../Growl';
-import * as Localize from '../Localize';
 import Navigation from '../Navigation/Navigation';
 import * as CardUtils from '../CardUtils';
-import * as User from './User';
 import ROUTES from '../../ROUTES';
 
-function deletePayPalMe() {
-    User.deletePaypalMeAddress();
-    Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000);
-}
-
 /**
  * Sets up a ref to an instance of the KYC Wall component.
  */
@@ -344,7 +336,6 @@ function deletePaymentCard(fundID) {
 }
 
 export {
-    deletePayPalMe,
     deletePaymentCard,
     addPaymentCard,
     openWalletPage,
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 87c77e722a5c..93b46f2e53da 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -421,6 +421,7 @@ function updateWorkspaceAvatar(policyID, file) {
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 avatar: file.uri,
+                originalFileName: file.name,
                 errorFields: {
                     avatar: null,
                 },
diff --git a/src/libs/actions/QueuedOnyxUpdates.js b/src/libs/actions/QueuedOnyxUpdates.ts
similarity index 53%
rename from src/libs/actions/QueuedOnyxUpdates.js
rename to src/libs/actions/QueuedOnyxUpdates.ts
index 486108dd56cf..ac94e6f335e3 100644
--- a/src/libs/actions/QueuedOnyxUpdates.js
+++ b/src/libs/actions/QueuedOnyxUpdates.ts
@@ -1,19 +1,18 @@
-import Onyx from 'react-native-onyx';
+import Onyx, {OnyxUpdate} from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
 // In this file we manage a queue of Onyx updates while the SequentialQueue is processing. There are functions to get the updates and clear the queue after saving the updates in Onyx.
 
-let queuedOnyxUpdates = [];
+let queuedOnyxUpdates: OnyxUpdate[] = [];
 Onyx.connect({
     key: ONYXKEYS.QUEUED_ONYX_UPDATES,
-    callback: (val) => (queuedOnyxUpdates = val || []),
+    callback: (val) => (queuedOnyxUpdates = val ?? []),
 });
 
 /**
- * @param {Array<Object>} updates Onyx updates to queue for later
- * @returns {Promise}
+ * @param updates Onyx updates to queue for later
  */
-function queueOnyxUpdates(updates) {
+function queueOnyxUpdates(updates: OnyxUpdate[]): Promise<void> {
     return Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, [...queuedOnyxUpdates, ...updates]);
 }
 
@@ -21,11 +20,8 @@ function clear() {
     Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, null);
 }
 
-/**
- * @returns {Array<Object>}
- */
-function getQueuedUpdates() {
-    return queuedOnyxUpdates;
+function flushQueue(): Promise<void> {
+    return Onyx.update(queuedOnyxUpdates).then(clear);
 }
 
-export {queueOnyxUpdates, clear, getQueuedUpdates};
+export {queueOnyxUpdates, flushQueue};
diff --git a/src/libs/actions/Receipt.js b/src/libs/actions/Receipt.ts
similarity index 72%
rename from src/libs/actions/Receipt.js
rename to src/libs/actions/Receipt.ts
index fbe9c22faaa2..530db149d902 100644
--- a/src/libs/actions/Receipt.js
+++ b/src/libs/actions/Receipt.ts
@@ -3,12 +3,8 @@ import ONYXKEYS from '../../ONYXKEYS';
 
 /**
  * Sets the upload receipt error modal content when an invalid receipt is uploaded
- *
- * @param {Boolean} isAttachmentInvalid
- * @param {String} attachmentInvalidReasonTitle
- * @param {String} attachmentInvalidReason
  */
-function setUploadReceiptError(isAttachmentInvalid, attachmentInvalidReasonTitle, attachmentInvalidReason) {
+function setUploadReceiptError(isAttachmentInvalid: boolean, attachmentInvalidReasonTitle: string, attachmentInvalidReason: string) {
     Onyx.merge(ONYXKEYS.RECEIPT_MODAL, {
         isAttachmentInvalid,
         attachmentInvalidReasonTitle,
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 8b898a6aaaea..2a34c839a94e 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -25,9 +25,9 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as UserUtils from '../UserUtils';
 import * as Welcome from './Welcome';
 import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
-import SidebarUtils from '../SidebarUtils';
 import * as OptionsListUtils from '../OptionsListUtils';
 import * as Environment from '../Environment/Environment';
+import * as Session from './Session';
 
 let currentUserAccountID;
 Onyx.connect({
@@ -528,12 +528,12 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
             onyxData.optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: {[parentReportActionID]: {childReportID: reportID}},
+                value: {[parentReportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
             });
             onyxData.failureData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: {[parentReportActionID]: {childReportID: '0'}},
+                value: {[parentReportActionID]: {childReportID: '0', childType: ''}},
             });
         }
     }
@@ -926,7 +926,7 @@ function deleteReportComment(reportID, reportAction) {
             html: '',
             text: '',
             isEdited: true,
-            isDeletedParentAction: ReportActionsUtils.hasCommentThread(reportAction),
+            isDeletedParentAction: ReportActionsUtils.isThreadParentMessage(reportAction, reportID),
         },
     ];
     const optimisticReportActions = {
@@ -1298,10 +1298,6 @@ function updateWriteCapabilityAndNavigate(report, newValue) {
  */
 function navigateToConciergeChat() {
     if (!conciergeChatReportID) {
-        // In order not to delay the report life cycle, we first navigate to the unknown report
-        if (!Navigation.getTopmostReportId()) {
-            Navigation.navigate(ROUTES.REPORT);
-        }
         // In order to avoid creating concierge repeatedly,
         // we need to ensure that the server data has been successfully pulled
         Welcome.serverDataIsReadyPromise().then(() => {
@@ -1763,13 +1759,12 @@ function openReportFromDeepLink(url, isAuthenticated) {
 
     // Navigate to the report after sign-in/sign-up.
     InteractionManager.runAfterInteractions(() => {
-        SidebarUtils.isSidebarLoadedReady().then(() => {
-            if (reportID) {
-                Navigation.navigate(ROUTES.getReportRoute(reportID), CONST.NAVIGATION.TYPE.UP);
-            }
+        Session.waitForUserSignIn().then(() => {
             if (route === ROUTES.CONCIERGE) {
                 navigateToConciergeChat();
+                return;
             }
+            Navigation.navigate(route, CONST.NAVIGATION.TYPE.PUSH);
         });
     });
 }
@@ -1934,6 +1929,136 @@ function flagComment(reportID, reportAction, severity) {
     API.write('FlagComment', parameters, {optimisticData, successData, failureData});
 }
 
+/**
+ * Updates a given user's private notes on a report
+ *
+ * @param {String} reportID
+ * @param {Number} accountID
+ * @param {String} note
+ */
+const updatePrivateNotes = (reportID, accountID, note) => {
+    const optimisticData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        errors: null,
+                        note,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        pendingAction: null,
+                        errors: null,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        errors: ErrorUtils.getMicroSecondOnyxError("Private notes couldn't be saved"),
+                    },
+                },
+            },
+        },
+    ];
+
+    API.write(
+        'UpdateReportPrivateNote',
+        {
+            reportID,
+            privateNotes: note,
+        },
+        {optimisticData, successData, failureData},
+    );
+};
+
+/**
+ * Fetches all the private notes for a given report
+ *
+ * @param {String} reportID
+ */
+function getReportPrivateNote(reportID) {
+    if (_.isEmpty(reportID)) {
+        return;
+    }
+    API.read(
+        'GetReportPrivateNote',
+        {
+            reportID,
+        },
+        {
+            optimisticData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: true,
+                    },
+                },
+            ],
+            successData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: false,
+                    },
+                },
+            ],
+            failureData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: false,
+                    },
+                },
+            ],
+        },
+    );
+}
+
+/**
+ * Checks if there are any errors in the private notes for a given report
+ *
+ * @param {Object} report
+ * @returns {Boolean} Returns true if there are errors in any of the private notes on the report
+ */
+function hasErrorInPrivateNotes(report) {
+    const privateNotes = lodashGet(report, 'privateNotes', {});
+    return _.some(privateNotes, (privateNote) => !_.isEmpty(privateNote.errors));
+}
+
+/**
+ * Clears all errors associated with a given private note
+ *
+ * @param {String} reportID
+ * @param {Number} accountID
+ */
+function clearPrivateNotesError(reportID, accountID) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {privateNotes: {[accountID]: {errors: null}}});
+}
+
 export {
     addComment,
     addAttachment,
@@ -1981,4 +2106,8 @@ export {
     setLastOpenedPublicRoom,
     flagComment,
     openLastOpenedPublicRoom,
+    updatePrivateNotes,
+    getReportPrivateNote,
+    clearPrivateNotesError,
+    hasErrorInPrivateNotes,
 };
diff --git a/src/libs/actions/ReportActions.js b/src/libs/actions/ReportActions.js
index 55d81cb6eb14..d270876840ac 100644
--- a/src/libs/actions/ReportActions.js
+++ b/src/libs/actions/ReportActions.js
@@ -2,20 +2,23 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import * as ReportActionUtils from '../ReportActionsUtils';
+import * as ReportUtils from '../ReportUtils';
 
 /**
  * @param {String} reportID
  * @param {Object} reportAction
  */
 function clearReportActionErrors(reportID, reportAction) {
+    const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
+
     if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         // Delete the optimistic action
-        Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+        Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, {
             [reportAction.reportActionID]: null,
         });
 
         // If there's a linked transaction, delete that too
-        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(reportID, reportAction.reportActionID);
+        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(originalReportID, reportAction.reportActionID);
         if (linkedTransactionID) {
             Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`, null);
         }
@@ -23,7 +26,7 @@ function clearReportActionErrors(reportID, reportAction) {
         return;
     }
 
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, {
         [reportAction.reportActionID]: {
             errors: null,
         },
diff --git a/src/libs/actions/Session/clearCache/index.js b/src/libs/actions/Session/clearCache/index.js
deleted file mode 100644
index 9ccd0193cfbd..000000000000
--- a/src/libs/actions/Session/clearCache/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function clearStorage() {
-    return new Promise((res) => res());
-}
-
-export default clearStorage;
diff --git a/src/libs/actions/Session/clearCache/index.native.js b/src/libs/actions/Session/clearCache/index.native.js
deleted file mode 100644
index 3bd647dbf8fb..000000000000
--- a/src/libs/actions/Session/clearCache/index.native.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import {CachesDirectoryPath, unlink} from 'react-native-fs';
-
-function clearStorage() {
-    // `unlink` is used to delete the caches directory
-    return unlink(CachesDirectoryPath);
-}
-
-export default clearStorage;
diff --git a/src/libs/actions/Session/clearCache/index.native.ts b/src/libs/actions/Session/clearCache/index.native.ts
new file mode 100644
index 000000000000..ce2e6beafa9f
--- /dev/null
+++ b/src/libs/actions/Session/clearCache/index.native.ts
@@ -0,0 +1,7 @@
+import {CachesDirectoryPath, unlink} from 'react-native-fs';
+import ClearCache from './types';
+
+// `unlink` is used to delete the caches directory
+const clearStorage: ClearCache = () => unlink(CachesDirectoryPath);
+
+export default clearStorage;
diff --git a/src/libs/actions/Session/clearCache/index.ts b/src/libs/actions/Session/clearCache/index.ts
new file mode 100644
index 000000000000..2722d8636a75
--- /dev/null
+++ b/src/libs/actions/Session/clearCache/index.ts
@@ -0,0 +1,5 @@
+import ClearCache from './types';
+
+const clearStorage: ClearCache = () => new Promise<void>((res) => res());
+
+export default clearStorage;
diff --git a/src/libs/actions/Session/clearCache/types.ts b/src/libs/actions/Session/clearCache/types.ts
new file mode 100644
index 000000000000..8c04b73e09c1
--- /dev/null
+++ b/src/libs/actions/Session/clearCache/types.ts
@@ -0,0 +1,3 @@
+type ClearCache = () => Promise<void>;
+
+export default ClearCache;
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index aa5ff229267f..8a8aabf6e8f4 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -20,13 +20,23 @@ import * as Device from '../Device';
 import ROUTES from '../../../ROUTES';
 import * as ErrorUtils from '../../ErrorUtils';
 import * as ReportUtils from '../../ReportUtils';
-import * as Report from '../Report';
 import {hideContextMenu} from '../../../pages/home/report/ContextMenu/ReportActionContextMenu';
 
-let authTokenType = '';
+let sessionAuthTokenType = '';
+let sessionAuthToken = null;
+let authPromiseResolver = null;
+
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (session) => (authTokenType = lodashGet(session, 'authTokenType')),
+    callback: (session) => {
+        sessionAuthTokenType = lodashGet(session, 'authTokenType');
+        sessionAuthToken = lodashGet(session, 'authToken');
+
+        if (sessionAuthToken && authPromiseResolver) {
+            authPromiseResolver(true);
+            authPromiseResolver = null;
+        }
+    },
 });
 
 let credentials = {};
@@ -61,7 +71,7 @@ function signOut() {
  * @return {boolean}
  */
 function isAnonymousUser() {
-    return authTokenType === 'anonymousAccount';
+    return sessionAuthTokenType === 'anonymousAccount';
 }
 
 function signOutAndRedirectToSignIn() {
@@ -75,7 +85,7 @@ function signOutAndRedirectToSignIn() {
         Linking.getInitialURL().then((url) => {
             const reportID = ReportUtils.getReportIDFromLink(url);
             if (reportID) {
-                Report.setLastOpenedPublicRoom(reportID);
+                Onyx.merge(ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID, reportID);
             }
         });
     }
@@ -749,6 +759,29 @@ function validateTwoFactorAuth(twoFactorAuthCode) {
     API.write('TwoFactorAuth_Validate', {twoFactorAuthCode}, {optimisticData, successData, failureData});
 }
 
+/**
+ * Waits for a user to sign in.
+ *
+ * If the user is already signed in (`authToken` is truthy), the promise resolves immediately.
+ * Otherwise, the promise will resolve when the `authToken` in `ONYXKEYS.SESSION` becomes truthy via the Onyx callback.
+ * The promise will not reject on failed login attempt.
+ *
+ * @returns {Promise<boolean>} A promise that resolves to `true` once the user is signed in.
+ * @example
+ * waitForUserSignIn().then(() => {
+ *   console.log('User is signed in!');
+ * });
+ */
+function waitForUserSignIn() {
+    return new Promise((resolve) => {
+        if (sessionAuthToken) {
+            resolve(true);
+        } else {
+            authPromiseResolver = resolve;
+        }
+    });
+}
+
 export {
     beginSignIn,
     beginAppleSignIn,
@@ -776,4 +809,5 @@ export {
     isAnonymousUser,
     toggleTwoFactorAuth,
     validateTwoFactorAuth,
+    waitForUserSignIn,
 };
diff --git a/src/libs/actions/Tab.js b/src/libs/actions/Tab.ts
similarity index 54%
rename from src/libs/actions/Tab.js
rename to src/libs/actions/Tab.ts
index 0af197361b70..7acd978d6b1a 100644
--- a/src/libs/actions/Tab.js
+++ b/src/libs/actions/Tab.ts
@@ -3,12 +3,9 @@ import ONYXKEYS from '../../ONYXKEYS';
 
 /**
  * Sets the selected tab for a given tab ID
- *
- * @param {String} id
- * @param {String} index
  */
-function setSelectedTab(id, index) {
-    Onyx.merge(`${ONYXKEYS.SELECTED_TAB}_${id}`, index);
+function setSelectedTab(id: string, index: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`, index);
 }
 
 export default {
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 6227686b3f45..f1fb4d96f523 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -13,6 +13,7 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import * as LocalePhoneNumber from '../LocalePhoneNumber';
+import * as Localize from '../Localize';
 
 let currentUserEmail;
 let currentUserAccountID;
@@ -187,6 +188,8 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
         value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}},
     });
 
+    clearOutTaskInfo();
+
     API.write(
         'CreateTask',
         {
@@ -270,12 +273,6 @@ function completeTask(taskReport, taskTitle) {
         },
     ];
 
-    // Update optimistic data for parent report action
-    const optimisticDataForParentReportAction = ReportUtils.getOptimisticDataForParentReportAction(taskReportID, completedTaskReportAction.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-    if (!_.isEmpty(optimisticDataForParentReportAction)) {
-        optimisticData.push(optimisticDataForParentReportAction);
-    }
-
     // Multiple report actions can link to the same child. Both share destination (task parent) and assignee report link to the same report action.
     // We need to find and update the other parent report action (in assignee report). More info https://github.com/Expensify/App/issues/23920#issuecomment-1663092717
     const assigneeReportAction = ReportUtils.getTaskParentReportActionIDInAssigneeReport(taskReport);
@@ -363,12 +360,6 @@ function reopenTask(taskReport, taskTitle) {
         },
     ];
 
-    // Update optimistic data for parent report action
-    const optimisticDataForParentReportAction = ReportUtils.getOptimisticDataForParentReportAction(taskReportID, reopenedTaskReportAction.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-    if (!_.isEmpty(optimisticDataForParentReportAction)) {
-        optimisticData.push(optimisticDataForParentReportAction);
-    }
-
     // Multiple report actions can link to the same child. Both share destination (task parent) and assignee report link to the same report action.
     // We need to find and update the other parent report action (in assignee report). More info https://github.com/Expensify/App/issues/23920#issuecomment-1663092717
     const assigneeReportAction = ReportUtils.getTaskParentReportActionIDInAssigneeReport(taskReport);
@@ -743,7 +734,10 @@ function getShareDestination(reportID, reports, personalDetails) {
     const report = lodashGet(reports, `report_${reportID}`, {});
     let subtitle = '';
     if (ReportUtils.isChatReport(report) && ReportUtils.isDM(report) && ReportUtils.hasSingleParticipant(report)) {
-        subtitle = LocalePhoneNumber.formatPhoneNumber(report.participants[0]);
+        const participantAccountID = lodashGet(report, 'participantAccountIDs[0]');
+        const displayName = lodashGet(personalDetails, [participantAccountID, 'displayName']);
+        const login = lodashGet(personalDetails, [participantAccountID, 'login']);
+        subtitle = LocalePhoneNumber.formatPhoneNumber(login || displayName);
     } else {
         subtitle = ReportUtils.getChatRoomSubtitle(report);
     }
@@ -762,26 +756,50 @@ function getShareDestination(reportID, reports, personalDetails) {
  * @param {number} originalStatusNum
  */
 function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum) {
-    const message = `canceled task: ${taskTitle}`;
+    const message = `deleted task: ${taskTitle}`;
     const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED, message);
     const optimisticReportActionID = optimisticCancelReportAction.reportActionID;
+    const taskReport = ReportUtils.getReport(taskReportID);
+    const parentReportAction = ReportActionsUtils.getParentReportAction(taskReport);
+    const parentReport = ReportUtils.getParentReport(taskReport);
+
+    const optimisticReportActions = {
+        [parentReportAction.reportActionID]: {
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            previousMessage: parentReportAction.message,
+            message: [
+                {
+                    translationKey: '',
+                    type: 'COMMENT',
+                    html: '',
+                    text: '',
+                    isEdited: true,
+                    isDeletedParentAction: true,
+                },
+            ],
+            errors: null,
+            linkMetaData: [],
+        },
+    };
 
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
             value: {
-                stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
-                statusNum: CONST.REPORT.STATUS.CLOSED,
+                lastVisibleActionCreated: optimisticCancelReportAction.created,
+                lastMessageText: message,
+                lastActorAccountID: optimisticCancelReportAction.actorAccountID,
+                updateReportInLHN: true,
+                isDeletedParentAction: true,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
             value: {
-                lastVisibleActionCreated: optimisticCancelReportAction.created,
-                lastMessageText: message,
-                lastActorAccountID: optimisticCancelReportAction.actorAccountID,
+                lastMessageText: ReportActionsUtils.getLastVisibleMessage(parentReport.reportID, {[parentReportAction.reportActionID]: null}).lastMessageText,
+                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(parentReport.reportID, {[parentReportAction.reportActionID]: null}).created,
             },
         },
         {
@@ -791,6 +809,11 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
                 [optimisticReportActionID]: optimisticCancelReportAction,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport.reportID}`,
+            value: optimisticReportActions,
+        },
     ];
 
     const successData = [
@@ -891,6 +914,35 @@ function clearEditTaskErrors(reportID) {
     });
 }
 
+/**
+ * @param {string} actionName
+ * @param {string} reportID
+ * @param {boolean} isCreateTaskAction
+ * @returns {string}
+ */
+function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) {
+    const report = ReportUtils.getReport(reportID);
+    if (isCreateTaskAction) {
+        return `Created a task: ${report.reportName}`;
+    }
+    let taskStatusText = '';
+    switch (actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
+            taskStatusText = Localize.translateLocal('task.messages.completed');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
+            taskStatusText = Localize.translateLocal('task.messages.canceled');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
+            taskStatusText = Localize.translateLocal('task.messages.reopened');
+            break;
+        default:
+            taskStatusText = Localize.translateLocal('task.task');
+    }
+
+    return `${taskStatusText} ${report.reportName}`;
+}
+
 export {
     createTaskAndNavigate,
     editTaskAndNavigate,
@@ -912,4 +964,5 @@ export {
     getTaskAssigneeAccountID,
     clearEditTaskErrors,
     canModifyTask,
+    getTaskReportActionMessage,
 };
diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 1dad0219db1a..663dfd1c8564 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -1,9 +1,11 @@
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import lodashHas from 'lodash/has';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as CollectionUtils from '../CollectionUtils';
 import * as API from '../API';
+import * as TransactionUtils from '../TransactionUtils';
 
 let recentWaypoints = [];
 Onyx.connect({
@@ -54,15 +56,6 @@ function addStop(transactionID) {
                 [`waypoint${newLastIndex}`]: {},
             },
         },
-
-        // Clear the existing route so that we don't show an old route
-        routes: {
-            route0: {
-                geometry: {
-                    coordinates: null,
-                },
-            },
-        },
     });
 }
 
@@ -93,6 +86,14 @@ function saveWaypoint(transactionID, index, waypoint) {
             },
         },
     });
+
+    // You can save offline waypoints without verifying the address (we will geocode it on the backend)
+    // We're going to prevent saving those addresses in the recent waypoints though since they could be invalid addresses
+    // However, in the backend once we verify the address, we will save the waypoint in the recent waypoints NVP
+    if (!lodashHas(waypoint, 'lat') || !lodashHas(waypoint, 'lng')) {
+        return;
+    }
+
     const recentWaypointAlreadyExists = _.find(recentWaypoints, (recentWaypoint) => recentWaypoint.address === waypoint.address);
     if (!recentWaypointAlreadyExists) {
         const clonedWaypoints = _.clone(recentWaypoints);
@@ -115,7 +116,8 @@ function removeWaypoint(transactionID, currentIndex) {
     }
 
     const waypointValues = _.values(existingWaypoints);
-    waypointValues.splice(index, 1);
+    const removed = waypointValues.splice(index, 1);
+    const isRemovedWaypointEmpty = removed.length > 0 && !TransactionUtils.waypointHasValidAddress(removed[0]);
 
     const reIndexedWaypoints = {};
     waypointValues.forEach((waypoint, idx) => {
@@ -125,21 +127,27 @@ function removeWaypoint(transactionID, currentIndex) {
     // Onyx.merge won't remove the null nested object values, this is a workaround
     // to remove nested keys while also preserving other object keys
     // Doing a deep clone of the transaction to avoid mutating the original object and running into a cache issue when using Onyx.set
-    const newTransaction = {
+    let newTransaction = {
         ...transaction,
         comment: {
             ...transaction.comment,
             waypoints: reIndexedWaypoints,
         },
-        // Clear the existing route so that we don't show an old route
-        routes: {
-            route0: {
-                geometry: {
-                    coordinates: null,
+    };
+
+    if (!isRemovedWaypointEmpty) {
+        newTransaction = {
+            ...newTransaction,
+            // Clear the existing route so that we don't show an old route
+            routes: {
+                route0: {
+                    geometry: {
+                        coordinates: null,
+                    },
                 },
             },
-        },
-    };
+        };
+    }
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, newTransaction);
 }
 
diff --git a/src/libs/actions/TwoFactorAuthActions.js b/src/libs/actions/TwoFactorAuthActions.ts
similarity index 85%
rename from src/libs/actions/TwoFactorAuthActions.js
rename to src/libs/actions/TwoFactorAuthActions.ts
index 3bc64b8ada4c..0cec7d3c16c8 100644
--- a/src/libs/actions/TwoFactorAuthActions.js
+++ b/src/libs/actions/TwoFactorAuthActions.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import {TwoFactorAuthStep} from '../../types/onyx/Account';
 
 /**
  * Clear 2FA data if the flow is interrupted without finishing
@@ -9,8 +10,7 @@ import ROUTES from '../../ROUTES';
 function clearTwoFactorAuthData() {
     Onyx.merge(ONYXKEYS.ACCOUNT, {recoveryCodes: '', twoFactorAuthSecretKey: '', twoFactorAuthStep: '', codesAreCopied: false});
 }
-
-function setTwoFactorAuthStep(twoFactorAuthStep) {
+function setTwoFactorAuthStep(twoFactorAuthStep: TwoFactorAuthStep) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {twoFactorAuthStep});
 }
 
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index b77c5b278bc9..8f6c7861d8aa 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -8,8 +8,6 @@ import CONST from '../../CONST';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import * as Pusher from '../Pusher/pusher';
-import Growl from '../Growl';
-import * as Localize from '../Localize';
 import * as Link from './Link';
 import * as SequentialQueue from '../Network/SequentialQueue';
 import PusherUtils from '../PusherUtils';
@@ -19,6 +17,7 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as Session from './Session';
 import * as PersonalDetails from './PersonalDetails';
 import * as OnyxUpdates from './OnyxUpdates';
+import redirectToSignIn from './SignInRedirect';
 
 let currentUserAccountID = '';
 let currentEmail = '';
@@ -70,6 +69,8 @@ function closeAccount(message) {
             ],
         },
     );
+    // Run cleanup actions to prevent reconnection callbacks from blocking logging in again
+    redirectToSignIn();
 }
 
 /**
@@ -462,64 +463,6 @@ function isBlockedFromConcierge(blockedFromConciergeNVP) {
     return moment().isBefore(moment(blockedFromConciergeNVP.expiresAt), 'day');
 }
 
-/**
- * Adds a paypal.me address for the user
- *
- * @param {String} address
- */
-function addPaypalMeAddress(address) {
-    const optimisticData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PAYPAL,
-            value: {
-                title: 'PayPal.me',
-                description: address,
-                methodID: CONST.PAYMENT_METHODS.PAYPAL,
-                key: 'payPalMePaymentMethod',
-                accountType: CONST.PAYMENT_METHODS.PAYPAL,
-                accountData: {
-                    username: address,
-                },
-                isDefault: false,
-            },
-        },
-    ];
-    API.write(
-        'AddPaypalMeAddress',
-        {
-            value: address,
-        },
-        {optimisticData},
-    );
-}
-
-/**
- * Deletes a paypal.me address for the user
- *
- */
-function deletePaypalMeAddress() {
-    const optimisticData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PAYPAL,
-            value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
-        },
-    ];
-
-    // Success data required for Android, more info here https://github.com/Expensify/App/pull/17903#discussion_r1175763081
-    const successData = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: ONYXKEYS.PAYPAL,
-            value: {},
-        },
-    ];
-
-    API.write('DeletePaypalMeAddress', {}, {optimisticData, successData});
-    Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000);
-}
-
 function triggerNotifications(onyxUpdates) {
     _.each(onyxUpdates, (update) => {
         if (!update.shouldNotify) {
@@ -546,8 +489,6 @@ function subscribeToUserEvents() {
     // Handles the mega multipleEvents from Pusher which contains an array of single events.
     // Each single event is passed to PusherUtils in order to trigger the callbacks for that event
     PusherUtils.subscribeToPrivateUserChannelEvent(Pusher.TYPE.MULTIPLE_EVENTS, currentUserAccountID, (pushJSON) => {
-        let updates;
-
         // The data for this push event comes in two different formats:
         // 1. Original format - this is what was sent before the RELIABLE_UPDATES project and will go away once RELIABLE_UPDATES is fully complete
         //     - The data is an array of objects, where each object is an onyx update
@@ -556,28 +497,44 @@ function subscribeToUserEvents() {
         //     - The data is an object, containing updateIDs from the server and an array of onyx updates (this array is the same format as the original format above)
         //       Example: {lastUpdateID: 1, previousUpdateID: 0, updates: [{onyxMethod: 'whatever', key: 'foo', value: 'bar'}]}
         if (_.isArray(pushJSON)) {
-            updates = pushJSON;
-        } else {
-            updates = pushJSON.updates;
-            OnyxUpdates.saveUpdateIDs(Number(pushJSON.lastUpdateID || 0), Number(pushJSON.previousUpdateID || 0));
+            _.each(pushJSON, (multipleEvent) => {
+                PusherUtils.triggerMultiEventHandler(multipleEvent.eventType, multipleEvent.data);
+            });
+            return;
         }
-        _.each(updates, (multipleEvent) => {
-            PusherUtils.triggerMultiEventHandler(multipleEvent.eventType, multipleEvent.data);
-        });
+
+        const updates = {
+            type: CONST.ONYX_UPDATE_TYPES.PUSHER,
+            lastUpdateID: Number(pushJSON.lastUpdateID || 0),
+            updates: pushJSON.updates,
+            previousUpdateID: Number(pushJSON.previousUpdateID || 0),
+        };
+        if (!OnyxUpdates.doesClientNeedToBeUpdated(Number(pushJSON.previousUpdateID || 0))) {
+            OnyxUpdates.apply(updates);
+            return;
+        }
+
+        // If we reached this point, we need to pause the queue while we prepare to fetch older OnyxUpdates.
+        SequentialQueue.pause();
+        OnyxUpdates.saveUpdateInformation(updates);
     });
 
     // Handles Onyx updates coming from Pusher through the mega multipleEvents.
-    PusherUtils.subscribeToMultiEvent(Pusher.TYPE.MULTIPLE_EVENT_TYPE.ONYX_API_UPDATE, (pushJSON) => {
+    PusherUtils.subscribeToMultiEvent(Pusher.TYPE.MULTIPLE_EVENT_TYPE.ONYX_API_UPDATE, (pushJSON) =>
         SequentialQueue.getCurrentRequest().then(() => {
             // If we don't have the currentUserAccountID (user is logged out) we don't want to update Onyx with data from Pusher
             if (!currentUserAccountID) {
                 return;
             }
 
-            Onyx.update(pushJSON);
+            const onyxUpdatePromise = Onyx.update(pushJSON);
             triggerNotifications(pushJSON);
-        });
-    });
+
+            // Return a promise when Onyx is done updating so that the OnyxUpdatesManager can properly apply all
+            // the onyx updates in order
+            return onyxUpdatePromise;
+        }),
+    );
 }
 
 /**
@@ -904,8 +861,6 @@ export {
     joinScreenShare,
     clearScreenShareRequest,
     generateStatementPDF,
-    deletePaypalMeAddress,
-    addPaypalMeAddress,
     updateChatPriorityMode,
     setContactMethodAsDefault,
     updateTheme,
diff --git a/src/libs/addEncryptedAuthTokenToURL.js b/src/libs/addEncryptedAuthTokenToURL.ts
similarity index 58%
rename from src/libs/addEncryptedAuthTokenToURL.js
rename to src/libs/addEncryptedAuthTokenToURL.ts
index 827454fa2aa3..9bdb83c284ce 100644
--- a/src/libs/addEncryptedAuthTokenToURL.js
+++ b/src/libs/addEncryptedAuthTokenToURL.ts
@@ -1,19 +1,15 @@
-import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 
 let encryptedAuthToken = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (session) => (encryptedAuthToken = lodashGet(session, 'encryptedAuthToken', '')),
+    callback: (session) => (encryptedAuthToken = session?.encryptedAuthToken ?? ''),
 });
 
 /**
  * Add encryptedAuthToken to this attachment URL
- *
- * @param {String} url
- * @returns {String}
  */
-export default function (url) {
+export default function (url: string) {
     return `${url}?encryptedAuthToken=${encodeURIComponent(encryptedAuthToken)}`;
 }
diff --git a/src/libs/asyncOpenURL/index.js b/src/libs/asyncOpenURL/index.ts
similarity index 60%
rename from src/libs/asyncOpenURL/index.js
rename to src/libs/asyncOpenURL/index.ts
index e69777c5483c..5307049ee923 100644
--- a/src/libs/asyncOpenURL/index.js
+++ b/src/libs/asyncOpenURL/index.ts
@@ -1,6 +1,7 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
-export default function asyncOpenURL(promise, url) {
+const asyncOpenURL: AsyncOpenURL = (promise, url) => {
     if (!url) {
         return;
     }
@@ -8,4 +9,6 @@ export default function asyncOpenURL(promise, url) {
     promise.then((params) => {
         Linking.openURL(typeof url === 'string' ? url : url(params));
     });
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/index.website.js b/src/libs/asyncOpenURL/index.website.ts
similarity index 61%
rename from src/libs/asyncOpenURL/index.website.js
rename to src/libs/asyncOpenURL/index.website.ts
index e1c491450c18..d503644c1392 100644
--- a/src/libs/asyncOpenURL/index.website.js
+++ b/src/libs/asyncOpenURL/index.website.ts
@@ -1,13 +1,11 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
 /**
  * Prevents Safari from blocking pop-up window when opened within async call.
- *
- * @param {Promise} promise
- * @param {string}  url
- * @param {Boolean} shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
+ * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
  */
-export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic) {
+const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) => {
     if (!url) {
         return;
     }
@@ -22,8 +20,13 @@ export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic)
         const windowRef = window.open();
         promise
             .then((params) => {
+                if (!windowRef) {
+                    return;
+                }
                 windowRef.location = typeof url === 'string' ? url : url(params);
             })
-            .catch(() => windowRef.close());
+            .catch(() => windowRef?.close());
     }
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/types.ts b/src/libs/asyncOpenURL/types.ts
new file mode 100644
index 000000000000..bf24756b0cc2
--- /dev/null
+++ b/src/libs/asyncOpenURL/types.ts
@@ -0,0 +1,3 @@
+type AsyncOpenURL = <T>(promise: Promise<T>, url: string | ((params: T) => string), shouldSkipCustomSafariLogic?: boolean) => void;
+
+export default AsyncOpenURL;
diff --git a/src/libs/calculateAnchorPosition.js b/src/libs/calculateAnchorPosition.js
deleted file mode 100644
index c886c9ac3712..000000000000
--- a/src/libs/calculateAnchorPosition.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import lodashGet from 'lodash/get';
-import CONST from '../CONST';
-
-/**
- * Gets the x,y position of the passed in component for the purpose of anchoring another component to it.
- *
- * @param {Element} anchorComponent
- * @param {{horizontal: string, vertical: string}} anchorOriginValue - Optional parameter
- * @return {Promise<unknown>}
- */
-export default function calculateAnchorPosition(anchorComponent, anchorOriginValue) {
-    return new Promise((resolve) => {
-        if (!anchorComponent) {
-            return resolve({horizontal: 0, vertical: 0});
-        }
-        anchorComponent.measureInWindow((x, y, width, height) => {
-            if (
-                lodashGet(anchorOriginValue, 'vertical') === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP &&
-                lodashGet(anchorOriginValue, 'horizontal') === CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT
-            ) {
-                return resolve({horizontal: x, vertical: y + height + lodashGet(anchorOriginValue, 'shiftVertical', 0)});
-            }
-            return resolve({horizontal: x + width, vertical: y});
-        });
-    });
-}
diff --git a/src/libs/calculateAnchorPosition.ts b/src/libs/calculateAnchorPosition.ts
new file mode 100644
index 000000000000..39fb3032ee09
--- /dev/null
+++ b/src/libs/calculateAnchorPosition.ts
@@ -0,0 +1,32 @@
+/* eslint-disable no-console */
+import {ValueOf} from 'type-fest';
+import {View} from 'react-native';
+import CONST from '../CONST';
+
+type AnchorOrigin = {
+    horizontal: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL>;
+    vertical: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL>;
+    shiftVertical?: number;
+};
+
+type AnchorPosition = {
+    horizontal: number;
+    vertical: number;
+};
+
+/**
+ * Gets the x,y position of the passed in component for the purpose of anchoring another component to it.
+ */
+export default function calculateAnchorPosition(anchorComponent: View, anchorOrigin?: AnchorOrigin): Promise<AnchorPosition> {
+    return new Promise((resolve) => {
+        if (!anchorComponent) {
+            return resolve({horizontal: 0, vertical: 0});
+        }
+        anchorComponent.measureInWindow((x, y, width, height) => {
+            if (anchorOrigin?.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP && anchorOrigin?.horizontal === CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT) {
+                return resolve({horizontal: x, vertical: y + height + (anchorOrigin?.shiftVertical ?? 0)});
+            }
+            return resolve({horizontal: x + width, vertical: y});
+        });
+    });
+}
diff --git a/src/libs/canFocusInputOnScreenFocus/index.js b/src/libs/canFocusInputOnScreenFocus/index.js
deleted file mode 100644
index c930c0d944ec..000000000000
--- a/src/libs/canFocusInputOnScreenFocus/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as DeviceCapabilities from '../DeviceCapabilities';
-
-export default () => !DeviceCapabilities.canUseTouchScreen();
diff --git a/src/libs/canFocusInputOnScreenFocus/index.native.js b/src/libs/canFocusInputOnScreenFocus/index.native.js
deleted file mode 100644
index eae5767cffbc..000000000000
--- a/src/libs/canFocusInputOnScreenFocus/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => false;
diff --git a/src/libs/canFocusInputOnScreenFocus/index.native.ts b/src/libs/canFocusInputOnScreenFocus/index.native.ts
new file mode 100644
index 000000000000..79d711c49fa6
--- /dev/null
+++ b/src/libs/canFocusInputOnScreenFocus/index.native.ts
@@ -0,0 +1,5 @@
+import CanFocusInputOnScreenFocus from './types';
+
+const canFocusInputOnScreenFocus: CanFocusInputOnScreenFocus = () => false;
+
+export default canFocusInputOnScreenFocus;
diff --git a/src/libs/canFocusInputOnScreenFocus/index.ts b/src/libs/canFocusInputOnScreenFocus/index.ts
new file mode 100644
index 000000000000..be500074d7e3
--- /dev/null
+++ b/src/libs/canFocusInputOnScreenFocus/index.ts
@@ -0,0 +1,6 @@
+import * as DeviceCapabilities from '../DeviceCapabilities';
+import CanFocusInputOnScreenFocus from './types';
+
+const canFocusInputOnScreenFocus: CanFocusInputOnScreenFocus = () => !DeviceCapabilities.canUseTouchScreen();
+
+export default canFocusInputOnScreenFocus;
diff --git a/src/libs/canFocusInputOnScreenFocus/types.ts b/src/libs/canFocusInputOnScreenFocus/types.ts
new file mode 100644
index 000000000000..5a65e5e7d198
--- /dev/null
+++ b/src/libs/canFocusInputOnScreenFocus/types.ts
@@ -0,0 +1,3 @@
+type CanFocusInputOnScreenFocus = () => boolean;
+
+export default CanFocusInputOnScreenFocus;
diff --git a/src/libs/checkForUpdates.js b/src/libs/checkForUpdates.js
deleted file mode 100644
index fbf7ee84a8a7..000000000000
--- a/src/libs/checkForUpdates.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const _ = require('underscore');
-
-const UPDATE_INTERVAL = 1000 * 60 * 60 * 8;
-
-/**
- * Check for updates every 8 hours and perform and platform-specific update
- *
- * @param {Object} platformSpecificUpdater
- * @param {Function} platformSpecificUpdater.update
- * @param {Function} [platformSpecificUpdater.init]
- */
-function checkForUpdates(platformSpecificUpdater) {
-    if (_.isFunction(platformSpecificUpdater.init)) {
-        platformSpecificUpdater.init();
-    }
-
-    // Check for updates every hour
-    setInterval(() => {
-        platformSpecificUpdater.update();
-    }, UPDATE_INTERVAL);
-}
-
-module.exports = checkForUpdates;
diff --git a/src/libs/checkForUpdates.ts b/src/libs/checkForUpdates.ts
new file mode 100644
index 000000000000..51ce12335e29
--- /dev/null
+++ b/src/libs/checkForUpdates.ts
@@ -0,0 +1,19 @@
+const UPDATE_INTERVAL = 1000 * 60 * 60 * 8;
+
+type PlatformSpecificUpdater = {
+    update: () => void;
+    init?: () => void;
+};
+
+function checkForUpdates(platformSpecificUpdater: PlatformSpecificUpdater) {
+    if (typeof platformSpecificUpdater.init === 'function') {
+        platformSpecificUpdater.init();
+    }
+
+    // Check for updates every hour
+    setInterval(() => {
+        platformSpecificUpdater.update();
+    }, UPDATE_INTERVAL);
+}
+
+module.exports = checkForUpdates;
diff --git a/src/libs/convertToLTR/index.android.js b/src/libs/convertToLTR/index.android.js
deleted file mode 100644
index aad1d536bf20..000000000000
--- a/src/libs/convertToLTR/index.android.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Android only - convert RTL text to a LTR text using Unicode controls.
- * https://www.w3.org/International/questions/qa-bidi-unicode-controls
- * @param {String} text
- * @returns {String}
- */
-export default function convertToLTR(text) {
-    return `\u2066${text}`;
-}
diff --git a/src/libs/convertToLTR/index.android.ts b/src/libs/convertToLTR/index.android.ts
new file mode 100644
index 000000000000..3a4755b1710f
--- /dev/null
+++ b/src/libs/convertToLTR/index.android.ts
@@ -0,0 +1,10 @@
+import CONST from '../../CONST';
+import ConvertToLTR from './types';
+
+/**
+ * Android only - convert RTL text to a LTR text using Unicode controls.
+ * https://www.w3.org/International/questions/qa-bidi-unicode-controls
+ */
+const convertToLTR: ConvertToLTR = (text) => `${CONST.UNICODE.LTR}${text}`;
+
+export default convertToLTR;
diff --git a/src/libs/convertToLTR/index.js b/src/libs/convertToLTR/index.js
deleted file mode 100644
index b69f2a1a4367..000000000000
--- a/src/libs/convertToLTR/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function convertToLTR(text) {
-    return text;
-}
diff --git a/src/libs/convertToLTR/index.ts b/src/libs/convertToLTR/index.ts
new file mode 100644
index 000000000000..58d8be93836e
--- /dev/null
+++ b/src/libs/convertToLTR/index.ts
@@ -0,0 +1,5 @@
+import ConvertToLTR from './types';
+
+const convertToLTR: ConvertToLTR = (text) => text;
+
+export default convertToLTR;
diff --git a/src/libs/convertToLTR/types.ts b/src/libs/convertToLTR/types.ts
new file mode 100644
index 000000000000..29b463e0a63a
--- /dev/null
+++ b/src/libs/convertToLTR/types.ts
@@ -0,0 +1,3 @@
+type ConvertToLTR = (text: string) => string;
+
+export default ConvertToLTR;
diff --git a/src/libs/cropOrRotateImage/index.native.js b/src/libs/cropOrRotateImage/index.native.ts
similarity index 71%
rename from src/libs/cropOrRotateImage/index.native.js
rename to src/libs/cropOrRotateImage/index.native.ts
index c1e21879f2be..08a5ecb04f6b 100644
--- a/src/libs/cropOrRotateImage/index.native.js
+++ b/src/libs/cropOrRotateImage/index.native.ts
@@ -1,16 +1,12 @@
 import RNImageManipulator from '@oguzhnatly/react-native-image-manipulator';
 import RNFetchBlob from 'react-native-blob-util';
+import {CropOrRotateImage} from './types';
 
 /**
  * Crops and rotates the image on ios/android
- *
- * @param {String} uri
- * @param {Array<Object>} actions
- * @param {Object} options
- * @returns {Promise<Object>} Returns cropped and rotated image
  */
-function cropOrRotateImage(uri, actions, options = {}) {
-    return new Promise((resolve) => {
+const cropOrRotateImage: CropOrRotateImage = (uri, actions, options) =>
+    new Promise((resolve) => {
         RNImageManipulator.manipulate(uri, actions, options).then((result) => {
             RNFetchBlob.fs.stat(result.uri.replace('file://', '')).then(({size}) => {
                 resolve({
@@ -22,6 +18,5 @@ function cropOrRotateImage(uri, actions, options = {}) {
             });
         });
     });
-}
 
 export default cropOrRotateImage;
diff --git a/src/libs/cropOrRotateImage/index.js b/src/libs/cropOrRotateImage/index.ts
similarity index 54%
rename from src/libs/cropOrRotateImage/index.js
rename to src/libs/cropOrRotateImage/index.ts
index ec19aff7c7e3..6b222c9759b5 100644
--- a/src/libs/cropOrRotateImage/index.js
+++ b/src/libs/cropOrRotateImage/index.ts
@@ -1,14 +1,14 @@
-import _ from 'underscore';
+import {CropOptions, CropOrRotateImage, CropOrRotateImageOptions, FileWithUri} from './types';
+
+type SizeFromAngle = {
+    width: number;
+    height: number;
+};
 
 /**
  * Calculates a size of canvas after rotation
- *
- * @param {Number} width
- * @param {Number} height
- * @param {Number} angle
- * @returns {Object} Returns width and height of new canvas
  */
-function sizeFromAngle(width, height, angle) {
+function sizeFromAngle(width: number, height: number, angle: number): SizeFromAngle {
     const radians = (angle * Math.PI) / 180;
     let sine = Math.cos(radians);
     let cosine = Math.sin(radians);
@@ -23,12 +23,8 @@ function sizeFromAngle(width, height, angle) {
 
 /**
  * Creates a new rotated canvas
- *
- * @param {Object} canvas
- * @param {Number} degrees
- * @returns {Object}
  */
-function rotateCanvas(canvas, degrees) {
+function rotateCanvas(canvas: HTMLCanvasElement, degrees: number): HTMLCanvasElement {
     const {width, height} = sizeFromAngle(canvas.width, canvas.height, degrees);
 
     // We have to create a new canvas because it is not possible to change already drawn
@@ -38,28 +34,24 @@ function rotateCanvas(canvas, degrees) {
     result.height = height;
 
     const context = result.getContext('2d');
+    if (context) {
+        // In order to rotate image along its center we have to apply next transformation
+        context.translate(result.width / 2, result.height / 2);
 
-    // In order to rotate image along its center we have to apply next transformation
-    context.translate(result.width / 2, result.height / 2);
-
-    const radians = (degrees * Math.PI) / 180;
-    context.rotate(radians);
-
-    context.drawImage(canvas, -canvas.width / 2, -canvas.height / 2, canvas.width, canvas.height);
+        const radians = (degrees * Math.PI) / 180;
+        context.rotate(radians);
 
+        context.drawImage(canvas, -canvas.width / 2, -canvas.height / 2, canvas.width, canvas.height);
+    }
     return result;
 }
 
 /**
  * Creates new cropped canvas and returns it
- *
- * @param {Object} canvas
- * @param {Object} options
- * @returns {Object}
  */
-function cropCanvas(canvas, options) {
+function cropCanvas(canvas: HTMLCanvasElement, options: CropOptions) {
     let {originX = 0, originY = 0, width = 0, height = 0} = options;
-    const clamp = (value, max) => Math.max(0, Math.min(max, value));
+    const clamp = (value: number, max: number) => Math.max(0, Math.min(max, value));
 
     width = clamp(width, canvas.width);
     height = clamp(height, canvas.height);
@@ -74,20 +66,18 @@ function cropCanvas(canvas, options) {
     result.height = height;
 
     const context = result.getContext('2d');
-    context.drawImage(canvas, originX, originY, width, height, 0, 0, width, height);
+    context?.drawImage(canvas, originX, originY, width, height, 0, 0, width, height);
 
     return result;
 }
 
-/**
- * @param {Object} canvas
- * @param {Object} options
- * @returns {Promise<File>}
- */
-function convertCanvasToFile(canvas, options = {}) {
+function convertCanvasToFile(canvas: HTMLCanvasElement, options: CropOrRotateImageOptions): Promise<FileWithUri> {
     return new Promise((resolve) => {
         canvas.toBlob((blob) => {
-            const file = new File([blob], options.name || 'fileName.jpeg', {type: options.type || 'image/jpeg'});
+            if (!blob) {
+                return;
+            }
+            const file = new File([blob], options.name || 'fileName.jpeg', {type: options.type || 'image/jpeg'}) as FileWithUri;
             file.uri = URL.createObjectURL(file);
             resolve(file);
         });
@@ -96,11 +86,8 @@ function convertCanvasToFile(canvas, options = {}) {
 
 /**
  * Loads image from specified url
- *
- * @param {String} uri
- * @returns {Promise<Object>}
  */
-function loadImageAsync(uri) {
+function loadImageAsync(uri: string): Promise<HTMLCanvasElement> {
     return new Promise((resolve, reject) => {
         const imageSource = new Image();
         imageSource.crossOrigin = 'anonymous';
@@ -110,7 +97,7 @@ function loadImageAsync(uri) {
             canvas.height = imageSource.naturalHeight;
 
             const context = canvas.getContext('2d');
-            context.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);
+            context?.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);
 
             resolve(canvas);
         };
@@ -121,30 +108,20 @@ function loadImageAsync(uri) {
 
 /**
  * Crops and rotates the image on web
- *
- * @param {String} uri
- * @param {Object} actions
- * @param {Object} options
- * @returns {Promise<Object>} Returns cropped and rotated image
  */
-function cropOrRotateImage(uri, actions, options) {
-    return loadImageAsync(uri).then((originalCanvas) => {
-        const resultCanvas = _.reduce(
-            actions,
-            (canvas, action) => {
-                if ('crop' in action) {
-                    return cropCanvas(canvas, action.crop);
-                }
-                if ('rotate' in action) {
-                    return rotateCanvas(canvas, action.rotate);
-                }
-                return canvas;
-            },
-            originalCanvas,
-        );
 
+const cropOrRotateImage: CropOrRotateImage = (uri, actions, options) =>
+    loadImageAsync(uri).then((originalCanvas) => {
+        const resultCanvas = actions.reduce((canvas, action) => {
+            if (action.crop) {
+                return cropCanvas(canvas, action.crop);
+            }
+            if (action.rotate) {
+                return rotateCanvas(canvas, action.rotate);
+            }
+            return canvas;
+        }, originalCanvas);
         return convertCanvasToFile(resultCanvas, options);
     });
-}
 
 export default cropOrRotateImage;
diff --git a/src/libs/cropOrRotateImage/types.ts b/src/libs/cropOrRotateImage/types.ts
new file mode 100644
index 000000000000..6abbdab49ea5
--- /dev/null
+++ b/src/libs/cropOrRotateImage/types.ts
@@ -0,0 +1,29 @@
+import {RNImageManipulatorResult} from '@oguzhnatly/react-native-image-manipulator';
+
+type CropOrRotateImageOptions = {
+    type: string;
+    name: string;
+    compress: number;
+};
+
+type CropOptions = {
+    originX: number;
+    originY: number;
+    width: number;
+    height: number;
+};
+
+type Action = {
+    crop?: CropOptions;
+    rotate?: number;
+};
+
+type FileWithUri = File & {
+    uri: string;
+};
+
+type CustomRNImageManipulatorResult = RNImageManipulatorResult & {size: number; type: string; name: string};
+
+type CropOrRotateImage = (uri: string, actions: Action[], options: CropOrRotateImageOptions) => Promise<FileWithUri | CustomRNImageManipulatorResult>;
+
+export type {CropOrRotateImage, CropOptions, Action, FileWithUri, CropOrRotateImageOptions};
diff --git a/src/libs/focusTextInputAfterAnimation/index.native.js b/src/libs/focusTextInputAfterAnimation/index.native.ts
similarity index 61%
rename from src/libs/focusTextInputAfterAnimation/index.native.js
rename to src/libs/focusTextInputAfterAnimation/index.native.ts
index 8cd44d111642..2ccbfe7368b2 100644
--- a/src/libs/focusTextInputAfterAnimation/index.native.js
+++ b/src/libs/focusTextInputAfterAnimation/index.native.ts
@@ -1,14 +1,15 @@
+import FocusTextInputAfterAnimation from './types';
+
 /**
  * Focus the text input with a slight delay to make sure modals are closed first.
  * Since in react-native-modal `onModalHide` is called before the modal is actually hidden.
  * It results in the keyboard being dismissed right away on both iOS and Android.
  * See this discussion for more details: https://github.com/Expensify/App/issues/18300
  *
- * @param {Object} inputRef
- * @param {Number} animationLength you must use your best guess as to what a good animationLength is. It can't be too short, or the animation won't be finished. It can't be too long or
+ * @param animationLength you must use your best guess as to what a good animationLength is. It can't be too short, or the animation won't be finished. It can't be too long or
  *      the user will notice that it feels sluggish
  */
-const focusTextInputAfterAnimation = (inputRef, animationLength = 0) => {
+const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef, animationLength = 0) => {
     setTimeout(() => {
         inputRef.focus();
     }, animationLength);
diff --git a/src/libs/focusTextInputAfterAnimation/index.js b/src/libs/focusTextInputAfterAnimation/index.ts
similarity index 61%
rename from src/libs/focusTextInputAfterAnimation/index.js
rename to src/libs/focusTextInputAfterAnimation/index.ts
index dba6e0fdcddc..1e3211372b41 100644
--- a/src/libs/focusTextInputAfterAnimation/index.js
+++ b/src/libs/focusTextInputAfterAnimation/index.ts
@@ -1,9 +1,9 @@
+import FocusTextInputAfterAnimation from './types';
+
 /**
  * This library is a no-op for all platforms except for Android and iOS and will immediately focus the given input without any delays.
- *
- * @param {Object} inputRef
  */
-const focusTextInputAfterAnimation = (inputRef) => {
+const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef) => {
     inputRef.focus();
 };
 
diff --git a/src/libs/focusTextInputAfterAnimation/types.ts b/src/libs/focusTextInputAfterAnimation/types.ts
new file mode 100644
index 000000000000..905ac7db4b7a
--- /dev/null
+++ b/src/libs/focusTextInputAfterAnimation/types.ts
@@ -0,0 +1,5 @@
+import {TextInput} from 'react-native';
+
+type FocusTextInputAfterAnimation = (inputRef: TextInput | HTMLInputElement, animationLength: number) => void;
+
+export default FocusTextInputAfterAnimation;
diff --git a/src/libs/getButtonState.js b/src/libs/getButtonState.ts
similarity index 56%
rename from src/libs/getButtonState.js
rename to src/libs/getButtonState.ts
index c4536831bbf2..af7c4db6b4ec 100644
--- a/src/libs/getButtonState.js
+++ b/src/libs/getButtonState.ts
@@ -1,16 +1,12 @@
+import {ValueOf} from 'type-fest';
 import CONST from '../CONST';
 
+type GetButtonState = (isActive: boolean, isPressed: boolean, isComplete: boolean, isDisabled: boolean, isInteractive: boolean) => ValueOf<typeof CONST.BUTTON_STATES>;
+
 /**
  * Get the string representation of a button's state.
- *
- * @param {Boolean} [isActive]
- * @param {Boolean} [isPressed]
- * @param {Boolean} [isComplete]
- * @param {Boolean} [isDisabled]
- * @param {Boolean} [isInteractive]
- * @returns {String}
  */
-export default function (isActive = false, isPressed = false, isComplete = false, isDisabled = false, isInteractive = true) {
+const getButtonState: GetButtonState = (isActive = false, isPressed = false, isComplete = false, isDisabled = false, isInteractive = true) => {
     if (!isInteractive) {
         return CONST.BUTTON_STATES.DEFAULT;
     }
@@ -32,4 +28,6 @@ export default function (isActive = false, isPressed = false, isComplete = false
     }
 
     return CONST.BUTTON_STATES.DEFAULT;
-}
+};
+
+export default getButtonState;
diff --git a/src/libs/getComponentDisplayName.js b/src/libs/getComponentDisplayName.js
deleted file mode 100644
index 4c643bff1bfa..000000000000
--- a/src/libs/getComponentDisplayName.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Returns the display name of a component
- *
- * @param {object} component
- * @returns {string}
- */
-export default function getComponentDisplayName(component) {
-    return component.displayName || component.name || 'Component';
-}
diff --git a/src/libs/getComponentDisplayName.ts b/src/libs/getComponentDisplayName.ts
new file mode 100644
index 000000000000..fd1bbcaea521
--- /dev/null
+++ b/src/libs/getComponentDisplayName.ts
@@ -0,0 +1,6 @@
+import {ComponentType} from 'react';
+
+/** Returns the display name of a component */
+export default function getComponentDisplayName(component: ComponentType): string {
+    return component.displayName ?? component.name ?? 'Component';
+}
diff --git a/src/libs/getIsReportFullyVisible.js b/src/libs/getIsReportFullyVisible.ts
similarity index 63%
rename from src/libs/getIsReportFullyVisible.js
rename to src/libs/getIsReportFullyVisible.ts
index a8e4100acf4d..525dd0743736 100644
--- a/src/libs/getIsReportFullyVisible.js
+++ b/src/libs/getIsReportFullyVisible.ts
@@ -2,11 +2,7 @@ import Visibility from './Visibility';
 
 /**
  * When the app is visible and the report screen is focused we can assume that the report is fully visible.
- *
- * @param {Boolean} isFocused
- *
- * @returns {Boolean}
  */
-export default function getIsReportFullyVisible(isFocused) {
+export default function getIsReportFullyVisible(isFocused: boolean): boolean {
     return Visibility.isVisible() && isFocused;
 }
diff --git a/src/libs/getOperatingSystem/index.native.js b/src/libs/getOperatingSystem/index.native.ts
similarity index 72%
rename from src/libs/getOperatingSystem/index.native.js
rename to src/libs/getOperatingSystem/index.native.ts
index fce2857548f1..38b87f4983b7 100644
--- a/src/libs/getOperatingSystem/index.native.js
+++ b/src/libs/getOperatingSystem/index.native.ts
@@ -1,11 +1,11 @@
 import {Platform} from 'react-native';
 import CONST from '../../CONST';
+import GetOperatingSystem from './types';
 
 /**
  * Reads the current operating system for native platforms.
- * @return {String | null}
  */
-export default () => {
+const getOperatingSystem: GetOperatingSystem = () => {
     switch (Platform.OS) {
         case 'ios':
             return CONST.OS.IOS;
@@ -15,3 +15,5 @@ export default () => {
             return CONST.OS.NATIVE;
     }
 };
+
+export default getOperatingSystem;
diff --git a/src/libs/getOperatingSystem/index.js b/src/libs/getOperatingSystem/index.ts
similarity index 69%
rename from src/libs/getOperatingSystem/index.js
rename to src/libs/getOperatingSystem/index.ts
index d1ffac6defa7..7adfa27c45fc 100644
--- a/src/libs/getOperatingSystem/index.js
+++ b/src/libs/getOperatingSystem/index.ts
@@ -1,22 +1,21 @@
-import _ from 'underscore';
 import CONST from '../../CONST';
+import GetOperatingSystem from './types';
 
 /**
  * Reads the current operating system when running on Web/Mobile-Web/Desktop
- * @return {String | null}
  */
-export default () => {
+const getOperatingSystem: GetOperatingSystem = () => {
     const {userAgent, platform} = window.navigator;
     const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
     const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
     const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
 
     let os = null;
-    if (_.contains(macosPlatforms, platform)) {
+    if (macosPlatforms.includes(platform)) {
         os = CONST.OS.MAC_OS;
-    } else if (_.contains(iosPlatforms, platform)) {
+    } else if (iosPlatforms.includes(platform)) {
         os = CONST.OS.IOS;
-    } else if (_.contains(windowsPlatforms, platform)) {
+    } else if (windowsPlatforms.includes(platform)) {
         os = CONST.OS.WINDOWS;
     } else if (/Android/.test(userAgent)) {
         os = CONST.OS.ANDROID;
@@ -25,3 +24,5 @@ export default () => {
     }
     return os;
 };
+
+export default getOperatingSystem;
diff --git a/src/libs/getOperatingSystem/types.ts b/src/libs/getOperatingSystem/types.ts
new file mode 100644
index 000000000000..64bb103db083
--- /dev/null
+++ b/src/libs/getOperatingSystem/types.ts
@@ -0,0 +1,7 @@
+import {ValueOf} from 'type-fest';
+import CONST from '../../CONST';
+
+type OS = ValueOf<typeof CONST.OS> | null;
+type GetOperatingSystem = () => OS;
+
+export default GetOperatingSystem;
diff --git a/src/libs/getPlaidDesktopMessage/index.desktop.js b/src/libs/getPlaidDesktopMessage/index.desktop.js
deleted file mode 100644
index f801bafe724d..000000000000
--- a/src/libs/getPlaidDesktopMessage/index.desktop.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => 'bankAccount.desktopConnection';
diff --git a/src/libs/getPlaidDesktopMessage/index.desktop.ts b/src/libs/getPlaidDesktopMessage/index.desktop.ts
new file mode 100644
index 000000000000..93a336af8227
--- /dev/null
+++ b/src/libs/getPlaidDesktopMessage/index.desktop.ts
@@ -0,0 +1,5 @@
+import GetPlaidDesktopMessage from './types';
+
+const getPlaidDesktopMessage: GetPlaidDesktopMessage = () => 'bankAccount.desktopConnection';
+
+export default getPlaidDesktopMessage;
diff --git a/src/libs/getPlaidDesktopMessage/index.js b/src/libs/getPlaidDesktopMessage/index.js
deleted file mode 100644
index 2d1ec238274a..000000000000
--- a/src/libs/getPlaidDesktopMessage/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => {};
diff --git a/src/libs/getPlaidDesktopMessage/index.ts b/src/libs/getPlaidDesktopMessage/index.ts
new file mode 100644
index 000000000000..deccb4df0ac2
--- /dev/null
+++ b/src/libs/getPlaidDesktopMessage/index.ts
@@ -0,0 +1,5 @@
+import GetPlaidDesktopMessage from './types';
+
+const getPlaidDesktopMessage: GetPlaidDesktopMessage = () => undefined;
+
+export default getPlaidDesktopMessage;
diff --git a/src/libs/getPlaidDesktopMessage/types.ts b/src/libs/getPlaidDesktopMessage/types.ts
new file mode 100644
index 000000000000..12a13737339c
--- /dev/null
+++ b/src/libs/getPlaidDesktopMessage/types.ts
@@ -0,0 +1,3 @@
+type GetPlaidDesktopMessage = () => string | undefined;
+
+export default GetPlaidDesktopMessage;
diff --git a/src/libs/getSecureEntryKeyboardType/index.android.js b/src/libs/getSecureEntryKeyboardType/index.android.js
deleted file mode 100644
index 03ba8f571fe9..000000000000
--- a/src/libs/getSecureEntryKeyboardType/index.android.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import CONST from '../../CONST';
-
-/**
- * Return visible-password keyboard type when secure text is visible on Android,
- * otherwise return keyboardType passed as function parameter
- * @param {String} keyboardType
- * @param {Boolean} secureTextEntry
- * @param {Boolean} passwordHidden
- * @return {String}
- */
-export default (keyboardType, secureTextEntry, passwordHidden) => (secureTextEntry && !passwordHidden ? CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD : keyboardType);
diff --git a/src/libs/getSecureEntryKeyboardType/index.android.ts b/src/libs/getSecureEntryKeyboardType/index.android.ts
new file mode 100644
index 000000000000..afd808f35b10
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/index.android.ts
@@ -0,0 +1,11 @@
+import CONST from '../../CONST';
+import GetSecureEntryKeyboardType from './types';
+
+/**
+ * Return visible-password keyboard type when secure text is visible on Android,
+ * otherwise return keyboardType passed as function parameter
+ */
+const getSecureEntryKeyboardType: GetSecureEntryKeyboardType = (keyboardType, secureTextEntry, passwordHidden) =>
+    secureTextEntry && !passwordHidden ? CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD : keyboardType;
+
+export default getSecureEntryKeyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/index.js b/src/libs/getSecureEntryKeyboardType/index.js
deleted file mode 100644
index f6e2b9919b10..000000000000
--- a/src/libs/getSecureEntryKeyboardType/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Return keyboardType passed as function parameter on Web/Desktop/iOS
- * @param {String} keyboardType
- * @return {String}
- */
-export default (keyboardType) => keyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/index.ts b/src/libs/getSecureEntryKeyboardType/index.ts
new file mode 100644
index 000000000000..030a88e60e84
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/index.ts
@@ -0,0 +1,8 @@
+import GetSecureEntryKeyboardType from './types';
+
+/**
+ * Return keyboardType passed as function parameter on Web/Desktop/iOS
+ */
+const getSecureEntryKeyboardType: GetSecureEntryKeyboardType = (keyboardType) => keyboardType;
+
+export default getSecureEntryKeyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/types.ts b/src/libs/getSecureEntryKeyboardType/types.ts
new file mode 100644
index 000000000000..fe79440e3109
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/types.ts
@@ -0,0 +1,3 @@
+type GetSecureEntryKeyboardType = (keyboardType: string, secureTextEntry: boolean, passwordHidden: boolean) => string;
+
+export default GetSecureEntryKeyboardType;
diff --git a/src/libs/getWindowHeightAdjustment/index.android.js b/src/libs/getWindowHeightAdjustment/index.android.js
deleted file mode 100644
index b360467d31c1..000000000000
--- a/src/libs/getWindowHeightAdjustment/index.android.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// On Android the window height does not include the status bar height, so we need to add it manually.
-export default function getWindowHeightAdjustment(insets) {
-    return insets.top;
-}
diff --git a/src/libs/getWindowHeightAdjustment/index.android.ts b/src/libs/getWindowHeightAdjustment/index.android.ts
new file mode 100644
index 000000000000..1a06e663d4e3
--- /dev/null
+++ b/src/libs/getWindowHeightAdjustment/index.android.ts
@@ -0,0 +1,6 @@
+import GetWindowHeightAdjustment from './types';
+
+// On Android the window height does not include the status bar height, so we need to add it manually.
+const getWindowHeightAdjustment: GetWindowHeightAdjustment = (insets) => insets?.top ?? 0;
+
+export default getWindowHeightAdjustment;
diff --git a/src/libs/getWindowHeightAdjustment/index.js b/src/libs/getWindowHeightAdjustment/index.js
deleted file mode 100644
index 9ddd1e7cefee..000000000000
--- a/src/libs/getWindowHeightAdjustment/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Some platforms need to adjust the window height.
-export default function getWindowHeightAdjustment() {
-    return 0;
-}
diff --git a/src/libs/getWindowHeightAdjustment/index.ts b/src/libs/getWindowHeightAdjustment/index.ts
new file mode 100644
index 000000000000..9a768d00cd4d
--- /dev/null
+++ b/src/libs/getWindowHeightAdjustment/index.ts
@@ -0,0 +1,6 @@
+import GetWindowHeightAdjustment from './types';
+
+// Some platforms need to adjust the window height.
+const getWindowHeightAdjustment: GetWindowHeightAdjustment = () => 0;
+
+export default getWindowHeightAdjustment;
diff --git a/src/libs/getWindowHeightAdjustment/types.ts b/src/libs/getWindowHeightAdjustment/types.ts
new file mode 100644
index 000000000000..ddb6723f6320
--- /dev/null
+++ b/src/libs/getWindowHeightAdjustment/types.ts
@@ -0,0 +1,5 @@
+import {EdgeInsets} from 'react-native-safe-area-context';
+
+type GetWindowHeightAdjustment = (insets: EdgeInsets | null) => number;
+
+export default GetWindowHeightAdjustment;
diff --git a/src/libs/hashCode.js b/src/libs/hashCode.ts
similarity index 80%
rename from src/libs/hashCode.js
rename to src/libs/hashCode.ts
index a95d0787a6e3..bb0522c25de0 100644
--- a/src/libs/hashCode.js
+++ b/src/libs/hashCode.ts
@@ -2,11 +2,11 @@
 /**
  * Simple string hashing function obtained from: https://stackoverflow.com/a/8831937/16434681
  * Returns a hash code from a string
- * @param  {String} str The string to hash.
- * @return {Number} A 32bit integer (can be negative)
+ * @param str The string to hash.
+ * @return A 32bit integer (can be negative)
  * @see http://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
  */
-function hashCode(str) {
+function hashCode(str: string): number {
     let hash = 0;
     for (let i = 0, len = str.length; i < len; i++) {
         const chr = str.charCodeAt(i);
diff --git a/src/libs/isInputAutoFilled.js b/src/libs/isInputAutoFilled.ts
similarity index 66%
rename from src/libs/isInputAutoFilled.js
rename to src/libs/isInputAutoFilled.ts
index 8daa72484647..0abe634001e4 100644
--- a/src/libs/isInputAutoFilled.js
+++ b/src/libs/isInputAutoFilled.ts
@@ -2,11 +2,9 @@ import isSelectorSupported from './isSelectorSupported';
 
 /**
  * Check the input is auto filled or not
- * @param  {Object} input
- * @return {Boolean}
  */
-export default function isInputAutoFilled(input) {
-    if (!input || !input.matches) return false;
+export default function isInputAutoFilled(input: Element): boolean {
+    if (!input?.matches) return false;
     if (isSelectorSupported(':autofill')) {
         return input.matches(':-webkit-autofill') || input.matches(':autofill');
     }
diff --git a/src/libs/isReportMessageAttachment.js b/src/libs/isReportMessageAttachment.ts
similarity index 65%
rename from src/libs/isReportMessageAttachment.js
rename to src/libs/isReportMessageAttachment.ts
index e107df8ddfaa..c257e1db4191 100644
--- a/src/libs/isReportMessageAttachment.js
+++ b/src/libs/isReportMessageAttachment.ts
@@ -1,21 +1,26 @@
 import CONST from '../CONST';
 
+type IsReportMessageAttachmentParams = {
+    text: string;
+    html: string;
+    translationKey: string;
+};
+
 /**
  * Check whether a report action is Attachment or not.
  * Ignore messages containing [Attachment] as the main content. Attachments are actions with only text as [Attachment].
  *
- * @param {Object} reportActionMessage report action's message as text, html and translationKey
- * @returns {Boolean}
+ * @param reportActionMessage report action's message as text, html and translationKey
  */
-export default function isReportMessageAttachment({text, html, translationKey}) {
-    if (translationKey) {
-        return translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
-    }
-
+export default function isReportMessageAttachment({text, html, translationKey}: IsReportMessageAttachmentParams): boolean {
     if (!text || !html) {
         return false;
     }
 
+    if (translationKey && text === CONST.ATTACHMENT_MESSAGE_TEXT) {
+        return translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
+    }
+
     const regex = new RegExp(` ${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="(.*)"`, 'i');
     return text === CONST.ATTACHMENT_MESSAGE_TEXT && (!!html.match(regex) || html === CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML);
 }
diff --git a/src/libs/isSelectorSupported/index.native.js b/src/libs/isSelectorSupported/index.native.js
deleted file mode 100644
index c393079f80b8..000000000000
--- a/src/libs/isSelectorSupported/index.native.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Native platforms do not support the selector
-export default function isSelectorSupported() {
-    return false;
-}
diff --git a/src/libs/isSelectorSupported/index.native.ts b/src/libs/isSelectorSupported/index.native.ts
new file mode 100644
index 000000000000..fa846e1410d9
--- /dev/null
+++ b/src/libs/isSelectorSupported/index.native.ts
@@ -0,0 +1,6 @@
+import IsSelectorSupported from './types';
+
+// Native platforms do not support the selector
+const isSelectorSupported: IsSelectorSupported = () => false;
+
+export default isSelectorSupported;
diff --git a/src/libs/isSelectorSupported/index.js b/src/libs/isSelectorSupported/index.ts
similarity index 54%
rename from src/libs/isSelectorSupported/index.js
rename to src/libs/isSelectorSupported/index.ts
index a574a3f12570..4f5f0313243e 100644
--- a/src/libs/isSelectorSupported/index.js
+++ b/src/libs/isSelectorSupported/index.ts
@@ -1,13 +1,15 @@
+import IsSelectorSupported from './types';
+
 /**
  * Check platform supports the selector or not
- * @param  {String} selector
- * @return {Boolean}
  */
-export default function isSelectorSupported(selector) {
+const isSelectorSupported: IsSelectorSupported = (selector) => {
     try {
         document.querySelector(selector);
         return true;
     } catch (error) {
         return false;
     }
-}
+};
+
+export default isSelectorSupported;
diff --git a/src/libs/isSelectorSupported/types.ts b/src/libs/isSelectorSupported/types.ts
new file mode 100644
index 000000000000..8fe75f82fad6
--- /dev/null
+++ b/src/libs/isSelectorSupported/types.ts
@@ -0,0 +1,3 @@
+type IsSelectorSupported = (selector: string) => boolean;
+
+export default IsSelectorSupported;
diff --git a/src/libs/onyxSubscribe.js b/src/libs/onyxSubscribe.js
deleted file mode 100644
index 600d010ed27f..000000000000
--- a/src/libs/onyxSubscribe.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Onyx from 'react-native-onyx';
-
-/**
- * Connect to onyx data. Same params as Onyx.connect(), but returns a function to unsubscribe.
- *
- * @param {Object} mapping Same as for Onyx.connect()
- * @return {function(): void} Unsubscribe callback
- */
-export default (mapping) => {
-    const connectionId = Onyx.connect(mapping);
-    return () => Onyx.disconnect(connectionId);
-};
diff --git a/src/libs/onyxSubscribe.ts b/src/libs/onyxSubscribe.ts
new file mode 100644
index 000000000000..469a7b810b1f
--- /dev/null
+++ b/src/libs/onyxSubscribe.ts
@@ -0,0 +1,15 @@
+import Onyx, {ConnectOptions} from 'react-native-onyx';
+import {OnyxKey} from '../ONYXKEYS';
+
+/**
+ * Connect to onyx data. Same params as Onyx.connect(), but returns a function to unsubscribe.
+ *
+ * @param mapping Same as for Onyx.connect()
+ * @return Unsubscribe callback
+ */
+function onyxSubscribe<TKey extends OnyxKey>(mapping: ConnectOptions<TKey>) {
+    const connectionId = Onyx.connect(mapping);
+    return () => Onyx.disconnect(connectionId);
+}
+
+export default onyxSubscribe;
diff --git a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js b/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js
deleted file mode 100644
index 4f3e8c5de2c8..000000000000
--- a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as Composer from '../actions/Composer';
-
-export default () => {
-    Composer.setShouldShowComposeInput(true);
-};
diff --git a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js b/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js
deleted file mode 100644
index 488769741715..000000000000
--- a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import {Keyboard} from 'react-native';
-import * as Composer from '../actions/Composer';
-
-export default () => {
-    const keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
-        Composer.setShouldShowComposeInput(true);
-        keyboardDidHideListener.remove();
-    });
-};
diff --git a/src/libs/requireParameters.js b/src/libs/requireParameters.js
deleted file mode 100644
index aa2d5e0dc8de..000000000000
--- a/src/libs/requireParameters.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ from 'underscore';
-
-/**
- * @throws {Error} If the "parameters" object has a null or undefined value for any of the given parameterNames
- *
- * @param {String[]} parameterNames Array of the required parameter names
- * @param {Object} parameters A map from available parameter names to their values
- * @param {String} commandName The name of the API command
- */
-export default function requireParameters(parameterNames, parameters, commandName) {
-    parameterNames.forEach((parameterName) => {
-        if (_(parameters).has(parameterName) && parameters[parameterName] !== null && parameters[parameterName] !== undefined) {
-            return;
-        }
-
-        const propertiesToRedact = ['authToken', 'password', 'partnerUserSecret', 'twoFactorAuthCode'];
-        const parametersCopy = _.chain(parameters)
-            .clone()
-            .mapObject((val, key) => (_.contains(propertiesToRedact, key) ? '<redacted>' : val))
-            .value();
-        const keys = _(parametersCopy).keys().join(', ') || 'none';
-
-        let error = `Parameter ${parameterName} is required for "${commandName}". `;
-        error += `Supplied parameters: ${keys}`;
-        throw new Error(error);
-    });
-}
diff --git a/src/libs/requireParameters.ts b/src/libs/requireParameters.ts
new file mode 100644
index 000000000000..098a6d114430
--- /dev/null
+++ b/src/libs/requireParameters.ts
@@ -0,0 +1,28 @@
+/**
+ * @throws {Error} If the "parameters" object has a null or undefined value for any of the given parameterNames
+ *
+ * @param parameterNames Array of the required parameter names
+ * @param parameters A map from available parameter names to their values
+ * @param commandName The name of the API command
+ */
+export default function requireParameters(parameterNames: string[], parameters: Record<string, unknown>, commandName: string): void {
+    parameterNames.forEach((parameterName) => {
+        if (parameterName in parameters && parameters[parameterName] !== null && parameters[parameterName] !== undefined) {
+            return;
+        }
+
+        const propertiesToRedact = ['authToken', 'password', 'partnerUserSecret', 'twoFactorAuthCode'];
+        const parametersCopy = {...parameters};
+        Object.keys(parametersCopy).forEach((key) => {
+            if (!propertiesToRedact.includes(key.toString())) return;
+
+            parametersCopy[key] = '<redacted>';
+        });
+
+        const keys = Object.keys(parametersCopy).join(', ') || 'none';
+
+        let error = `Parameter ${parameterName} is required for "${commandName}". `;
+        error += `Supplied parameters: ${keys}`;
+        throw new Error(error);
+    });
+}
diff --git a/src/libs/searchCountryOptions.js b/src/libs/searchCountryOptions.js
deleted file mode 100644
index 5aa8a052374e..000000000000
--- a/src/libs/searchCountryOptions.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import _ from 'lodash';
-import StringUtils from './StringUtils';
-
-/**
- * Searches the countries/states data and returns sorted results based on the search query
- * @param {String} searchValue
- * @param {Object[]} countriesData - An array of country data objects
- * @returns {Object[]} An array of countries/states sorted based on the search query
- */
-function searchCountryOptions(searchValue, countriesData) {
-    const trimmedSearchValue = StringUtils.sanitizeString(searchValue);
-    if (_.isEmpty(trimmedSearchValue)) {
-        return [];
-    }
-
-    const filteredData = _.filter(countriesData, (country) => _.includes(country.searchValue, trimmedSearchValue));
-
-    // sort by country code
-    return _.sortBy(filteredData, (country) => (_.toLower(country.value) === trimmedSearchValue ? -1 : 1));
-}
-
-export default searchCountryOptions;
diff --git a/src/libs/searchCountryOptions.ts b/src/libs/searchCountryOptions.ts
new file mode 100644
index 000000000000..8fb1cc9c37f3
--- /dev/null
+++ b/src/libs/searchCountryOptions.ts
@@ -0,0 +1,39 @@
+import StringUtils from './StringUtils';
+
+type CountryData = {
+    value: string;
+    keyForList: string;
+    text: string;
+    isSelected: boolean;
+    searchValue: string;
+};
+
+/**
+ * Searches the countries/states data and returns sorted results based on the search query
+ * @param countriesData - An array of country data objects
+ * @returns An array of countries/states sorted based on the search query
+ */
+function searchCountryOptions(searchValue: string, countriesData: CountryData[]): CountryData[] {
+    if (!searchValue) {
+        return countriesData;
+    }
+
+    const trimmedSearchValue = StringUtils.sanitizeString(searchValue);
+    if (!trimmedSearchValue) {
+        return [];
+    }
+
+    const filteredData = countriesData.filter((country) => country.searchValue.includes(trimmedSearchValue));
+
+    return filteredData.sort((a, b) => {
+        if (a.value.toLowerCase() === trimmedSearchValue) {
+            return -1;
+        }
+        if (b.value.toLowerCase() === trimmedSearchValue) {
+            return 1;
+        }
+        return 0;
+    });
+}
+
+export default searchCountryOptions;
diff --git a/src/libs/setSelection/index.js b/src/libs/setSelection/index.js
deleted file mode 100644
index c7f24ae4a199..000000000000
--- a/src/libs/setSelection/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function setSelection(textInput, start, end) {
-    if (!textInput) {
-        return;
-    }
-
-    textInput.setSelectionRange(start, end);
-}
diff --git a/src/libs/setSelection/index.native.js b/src/libs/setSelection/index.native.js
deleted file mode 100644
index 02d812d84cd4..000000000000
--- a/src/libs/setSelection/index.native.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function setSelection(textInput, start, end) {
-    if (!textInput) {
-        return;
-    }
-
-    textInput.setSelection(start, end);
-}
diff --git a/src/libs/setSelection/index.native.ts b/src/libs/setSelection/index.native.ts
new file mode 100644
index 000000000000..e27cd4e58bd7
--- /dev/null
+++ b/src/libs/setSelection/index.native.ts
@@ -0,0 +1,13 @@
+import SetSelection from './types';
+
+const setSelection: SetSelection = (textInput, start, end) => {
+    if (!textInput) {
+        return;
+    }
+
+    if ('setSelection' in textInput) {
+        textInput.setSelection(start, end);
+    }
+};
+
+export default setSelection;
diff --git a/src/libs/setSelection/index.ts b/src/libs/setSelection/index.ts
new file mode 100644
index 000000000000..5eee88881924
--- /dev/null
+++ b/src/libs/setSelection/index.ts
@@ -0,0 +1,13 @@
+import SetSelection from './types';
+
+const setSelection: SetSelection = (textInput, start, end) => {
+    if (!textInput) {
+        return;
+    }
+
+    if ('setSelectionRange' in textInput) {
+        textInput.setSelectionRange(start, end);
+    }
+};
+
+export default setSelection;
diff --git a/src/libs/setSelection/types.ts b/src/libs/setSelection/types.ts
new file mode 100644
index 000000000000..f2717079725f
--- /dev/null
+++ b/src/libs/setSelection/types.ts
@@ -0,0 +1,5 @@
+import {TextInput} from 'react-native';
+
+type SetSelection = (textInput: TextInput | HTMLInputElement, start: number, end: number) => void;
+
+export default SetSelection;
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.js
new file mode 100644
index 000000000000..a8ad5f54a65f
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.js
@@ -0,0 +1,5 @@
+import * as Composer from '../actions/Composer';
+
+export default (shouldShow) => {
+    Composer.setShouldShowComposeInput(shouldShow);
+};
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
new file mode 100644
index 000000000000..147d21d51168
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
@@ -0,0 +1,26 @@
+import {Keyboard} from 'react-native';
+import * as Composer from '../actions/Composer';
+
+let keyboardDidHideListener = null;
+export default (shouldShow) => {
+    if (keyboardDidHideListener) {
+        keyboardDidHideListener.remove();
+        keyboardDidHideListener = null;
+    }
+
+    if (!shouldShow) {
+        Composer.setShouldShowComposeInput(false);
+        return;
+    }
+
+    // If keyboard is already hidden, we should show composer immediately because keyboardDidHide event won't be called
+    if (!Keyboard.isVisible()) {
+        Composer.setShouldShowComposeInput(true);
+        return;
+    }
+
+    keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
+        Composer.setShouldShowComposeInput(true);
+        keyboardDidHideListener.remove();
+    });
+};
diff --git a/src/libs/shouldDelayFocus/index.android.js b/src/libs/shouldDelayFocus/index.android.js
deleted file mode 100644
index 4de1e1fc7f3a..000000000000
--- a/src/libs/shouldDelayFocus/index.android.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// When using transitions on Android, we need to delay focusing the text inputs for the keyboard to open.
-export default true;
diff --git a/src/libs/shouldDelayFocus/index.android.ts b/src/libs/shouldDelayFocus/index.android.ts
new file mode 100644
index 000000000000..566628c4df9d
--- /dev/null
+++ b/src/libs/shouldDelayFocus/index.android.ts
@@ -0,0 +1,6 @@
+import ShouldDelayFocus from './types';
+
+/** When using transitions on Android, we need to delay focusing the text inputs for the keyboard to open. */
+const shouldDelayFocus: ShouldDelayFocus = true;
+
+export default shouldDelayFocus;
diff --git a/src/libs/shouldDelayFocus/index.js b/src/libs/shouldDelayFocus/index.js
deleted file mode 100644
index 33136544dba2..000000000000
--- a/src/libs/shouldDelayFocus/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default false;
diff --git a/src/libs/shouldDelayFocus/index.ts b/src/libs/shouldDelayFocus/index.ts
new file mode 100644
index 000000000000..0ef7f9b2ccbe
--- /dev/null
+++ b/src/libs/shouldDelayFocus/index.ts
@@ -0,0 +1,5 @@
+import ShouldDelayFocus from './types';
+
+const shouldDelayFocus: ShouldDelayFocus = false;
+
+export default shouldDelayFocus;
diff --git a/src/libs/shouldDelayFocus/types.ts b/src/libs/shouldDelayFocus/types.ts
new file mode 100644
index 000000000000..8f9a150608a9
--- /dev/null
+++ b/src/libs/shouldDelayFocus/types.ts
@@ -0,0 +1,3 @@
+type ShouldDelayFocus = boolean;
+
+export default ShouldDelayFocus;
diff --git a/src/libs/shouldRenderOffscreen/index.android.js b/src/libs/shouldRenderOffscreen/index.android.js
deleted file mode 100644
index c91ffa15894d..000000000000
--- a/src/libs/shouldRenderOffscreen/index.android.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Rendering offscreen on Android allows it to apply opacity to stacked components correctly.
-export default true;
diff --git a/src/libs/shouldRenderOffscreen/index.android.ts b/src/libs/shouldRenderOffscreen/index.android.ts
new file mode 100644
index 000000000000..bf2d9837086f
--- /dev/null
+++ b/src/libs/shouldRenderOffscreen/index.android.ts
@@ -0,0 +1,6 @@
+import ShouldRenderOffscreen from './types';
+
+// Rendering offscreen on Android allows it to apply opacity to stacked components correctly.
+const shouldRenderOffscreen: ShouldRenderOffscreen = true;
+
+export default shouldRenderOffscreen;
diff --git a/src/libs/shouldRenderOffscreen/index.js b/src/libs/shouldRenderOffscreen/index.js
deleted file mode 100644
index 33136544dba2..000000000000
--- a/src/libs/shouldRenderOffscreen/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default false;
diff --git a/src/libs/shouldRenderOffscreen/index.ts b/src/libs/shouldRenderOffscreen/index.ts
new file mode 100644
index 000000000000..eadcc44814f9
--- /dev/null
+++ b/src/libs/shouldRenderOffscreen/index.ts
@@ -0,0 +1,5 @@
+import ShouldRenderOffscreen from './types';
+
+const shouldRenderOffscreen: ShouldRenderOffscreen = false;
+
+export default shouldRenderOffscreen;
diff --git a/src/libs/shouldRenderOffscreen/types.ts b/src/libs/shouldRenderOffscreen/types.ts
new file mode 100644
index 000000000000..63cd98eec31b
--- /dev/null
+++ b/src/libs/shouldRenderOffscreen/types.ts
@@ -0,0 +1,3 @@
+type ShouldRenderOffscreen = boolean;
+
+export default ShouldRenderOffscreen;
diff --git a/src/libs/tryResolveUrlFromApiRoot.js b/src/libs/tryResolveUrlFromApiRoot.ts
similarity index 69%
rename from src/libs/tryResolveUrlFromApiRoot.js
rename to src/libs/tryResolveUrlFromApiRoot.ts
index dc5780bb25e3..f9aef09a00a7 100644
--- a/src/libs/tryResolveUrlFromApiRoot.js
+++ b/src/libs/tryResolveUrlFromApiRoot.ts
@@ -15,11 +15,17 @@ const ORIGIN_PATTERN = new RegExp(`^(${ORIGINS_TO_REPLACE.join('|')})`);
  * - Similarly for prod or staging URLs we replace the `https://www.expensify`
  * or `https://staging.expensify` part, with `https://{API_ROOT}`
  * - Unmatched URLs (non expensify) are returned with no modifications
- *
- * @param {String} url
- * @returns {String}
  */
-export default function tryResolveUrlFromApiRoot(url) {
+function tryResolveUrlFromApiRoot(url: string): string;
+function tryResolveUrlFromApiRoot(url: number): number;
+function tryResolveUrlFromApiRoot(url: string | number): string | number {
+    // in native, when we import an image asset, it will have a number representation which can be used in `source` of Image
+    // in this case we can skip the url resolving
+    if (typeof url === 'number') {
+        return url;
+    }
     const apiRoot = ApiUtils.getApiRoot({shouldUseSecure: false});
     return url.replace(ORIGIN_PATTERN, apiRoot);
 }
+
+export default tryResolveUrlFromApiRoot;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.js b/src/libs/willBlurTextInputOnTapOutside/index.js
deleted file mode 100644
index 3c72b2d38a29..000000000000
--- a/src/libs/willBlurTextInputOnTapOutside/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => true;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.native.js b/src/libs/willBlurTextInputOnTapOutside/index.native.js
deleted file mode 100644
index eae5767cffbc..000000000000
--- a/src/libs/willBlurTextInputOnTapOutside/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => false;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.native.ts b/src/libs/willBlurTextInputOnTapOutside/index.native.ts
new file mode 100644
index 000000000000..1cf1bbafe7e6
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/index.native.ts
@@ -0,0 +1,5 @@
+import WillBlurTextInputOnTapOutside from './types';
+
+const willBlurTextInputOnTapOutside: WillBlurTextInputOnTapOutside = () => false;
+
+export default willBlurTextInputOnTapOutside;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.ts b/src/libs/willBlurTextInputOnTapOutside/index.ts
new file mode 100644
index 000000000000..7c88957821b3
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/index.ts
@@ -0,0 +1,5 @@
+import WillBlurTextInputOnTapOutside from './types';
+
+const willBlurTextInputOnTapOutside: WillBlurTextInputOnTapOutside = () => true;
+
+export default willBlurTextInputOnTapOutside;
diff --git a/src/libs/willBlurTextInputOnTapOutside/types.ts b/src/libs/willBlurTextInputOnTapOutside/types.ts
new file mode 100644
index 000000000000..1ef88eb98f8c
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/types.ts
@@ -0,0 +1,3 @@
+type WillBlurTextInputOnTapOutside = () => boolean;
+
+export default WillBlurTextInputOnTapOutside;
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index 53739820142b..5d4b99a0daf9 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -2,9 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {useFocusEffect} from '@react-navigation/native';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
-import CONST from '../CONST';
-import * as DemoActions from '../libs/actions/DemoActions';
 import Navigation from '../libs/Navigation/Navigation';
+import ROUTES from '../ROUTES';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -15,21 +14,15 @@ const propTypes = {
 };
 
 /*
- * This is a "utility page", that does this:
- *     - Looks at the current route
- *     - Determines if there's a demo command we need to call
- *     - If not, routes back to home
+ * This is a "utility page", that used to call specific actions depending on the
+ * route that led the user here. Now, it's just used to route the user home so we
+ * don't show them a "Hmm... It's not here" message (which looks broken).
  */
-function DemoSetupPage(props) {
+function DemoSetupPage() {
     useFocusEffect(() => {
-        // Depending on the route that the user hit to get here, run a specific demo flow
-        if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
-            DemoActions.runSaastrDemo();
-        } else if (props.route.name === CONST.DEMO_PAGES.SBE) {
-            DemoActions.runSbeDemo();
-        } else {
-            Navigation.goBack();
-        }
+        Navigation.isNavigationReady().then(() => {
+            Navigation.goBack(ROUTES.HOME);
+        });
     });
 
     return <FullScreenLoadingIndicator />;
diff --git a/src/pages/EditRequestDescriptionPage.js b/src/pages/EditRequestDescriptionPage.js
index 1db81c88daae..3916daecd33c 100644
--- a/src/pages/EditRequestDescriptionPage.js
+++ b/src/pages/EditRequestDescriptionPage.js
@@ -10,6 +10,7 @@ import styles from '../styles/styles';
 import Navigation from '../libs/Navigation/Navigation';
 import CONST from '../CONST';
 import useLocalize from '../hooks/useLocalize';
+import * as Browser from '../libs/Browser';
 
 const propTypes = {
     /** Transaction default description value */
@@ -49,6 +50,10 @@ function EditRequestDescriptionPage({defaultDescription, onSubmit}) {
                         accessibilityLabel={translate('moneyRequestConfirmationList.whatsItFor')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                         ref={(e) => (descriptionInputRef.current = e)}
+                        autoGrowHeight
+                        containerStyles={[styles.autoGrowHeightMultilineInput]}
+                        textAlignVertical="top"
+                        submitOnEnter={!Browser.isMobile()}
                     />
                 </View>
             </Form>
diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
index 5c128599e74a..bb37383cfbfe 100644
--- a/src/pages/EditRequestMerchantPage.js
+++ b/src/pages/EditRequestMerchantPage.js
@@ -1,6 +1,7 @@
-import React, {useRef} from 'react';
+import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
+import _ from 'underscore';
 import TextInput from '../components/TextInput';
 import ScreenWrapper from '../components/ScreenWrapper';
 import HeaderWithBackButton from '../components/HeaderWithBackButton';
@@ -22,6 +23,17 @@ const propTypes = {
 function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
     const {translate} = useLocalize();
     const merchantInputRef = useRef(null);
+
+    const validate = useCallback((value) => {
+        const errors = {};
+
+        if (_.isEmpty(value.merchant)) {
+            errors.merchant = 'common.error.fieldRequired';
+        }
+
+        return errors;
+    }, []);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -36,6 +48,7 @@ function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM}
                 onSubmit={onSubmit}
+                validate={validate}
                 submitButtonText={translate('common.save')}
                 enabledWhenOffline
             >
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 83b0019315e4..0094d174df21 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -18,6 +18,7 @@ import EditRequestAmountPage from './EditRequestAmountPage';
 import reportPropTypes from './reportPropTypes';
 import * as IOU from '../libs/actions/IOU';
 import * as CurrencyUtils from '../libs/CurrencyUtils';
+import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundView';
 
 const propTypes = {
     /** Route from navigation */
@@ -88,7 +89,9 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
         if (canEdit) {
             return;
         }
-        Navigation.dismissModal();
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal();
+        });
     }, [canEdit]);
 
     // Update the transaction object and close the modal
@@ -168,7 +171,7 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
         );
     }
 
-    return null;
+    return <FullPageNotFoundView shouldShow />;
 }
 
 EditRequestPage.displayName = 'EditRequestPage';
diff --git a/src/pages/ErrorPage/GenericErrorPage.js b/src/pages/ErrorPage/GenericErrorPage.js
index 3ff3bc686419..02ab38a1ef20 100644
--- a/src/pages/ErrorPage/GenericErrorPage.js
+++ b/src/pages/ErrorPage/GenericErrorPage.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import {View} from 'react-native';
+import {useErrorBoundary} from 'react-error-boundary';
 import Icon from '../../components/Icon';
 import defaultTheme from '../../styles/themes/default';
 import * as Expensicons from '../../components/Icon/Expensicons';
@@ -19,12 +19,11 @@ import * as StyleUtils from '../../styles/StyleUtils';
 
 const propTypes = {
     ...withLocalizePropTypes,
-
-    /** Callback to call on refresh button click */
-    onRefresh: PropTypes.func.isRequired,
 };
 
-function GenericErrorPage(props) {
+function GenericErrorPage({translate}) {
+    const {resetBoundary} = useErrorBoundary();
+
     return (
         <SafeAreaConsumer>
             {({paddingBottom}) => (
@@ -40,12 +39,12 @@ function GenericErrorPage(props) {
                                 />
                             </View>
                             <View style={styles.mb5}>
-                                <Text style={[styles.textHeadline]}>{props.translate('genericErrorPage.title')}</Text>
+                                <Text style={[styles.textHeadline]}>{translate('genericErrorPage.title')}</Text>
                             </View>
                             <View style={styles.mb5}>
                                 <ErrorBodyText />
                                 <Text>
-                                    {`${props.translate('genericErrorPage.body.helpTextConcierge')} `}
+                                    {`${translate('genericErrorPage.body.helpTextConcierge')} `}
                                     <TextLink
                                         href={`mailto:${CONST.EMAIL.CONCIERGE}`}
                                         style={[styles.link]}
@@ -59,17 +58,17 @@ function GenericErrorPage(props) {
                                     <Button
                                         success
                                         medium
-                                        onPress={props.onRefresh}
-                                        text={props.translate('genericErrorPage.refresh')}
+                                        onPress={resetBoundary}
+                                        text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
                                     />
                                     <Button
                                         medium
                                         onPress={() => {
                                             Session.signOutAndRedirectToSignIn();
-                                            props.onRefresh();
+                                            resetBoundary();
                                         }}
-                                        text={props.translate('initialSettingsPage.signOut')}
+                                        text={translate('initialSettingsPage.signOut')}
                                     />
                                 </View>
                             </View>
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.js b/src/pages/LogInWithShortLivedAuthTokenPage.js
index 1679d3aa8b5d..62eff262611d 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.js
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.js
@@ -8,7 +8,7 @@ import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import Navigation from '../libs/Navigation/Navigation';
 import styles from '../styles/styles';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Icon from '../components/Icon';
 import * as Expensicons from '../components/Icon/Expensicons';
 import * as Illustrations from '../components/Icon/Illustrations';
@@ -93,7 +93,7 @@ function LogInWithShortLivedAuthTokenPage(props) {
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 4a753c8632bd..e72cb9a3f79b 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -5,24 +5,23 @@ import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import OptionsSelector from '../components/OptionsSelector';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
+import Permissions from '../libs/Permissions';
 import * as ReportUtils from '../libs/ReportUtils';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
 import * as Report from '../libs/actions/Report';
 import CONST from '../CONST';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
-import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import ScreenWrapper from '../components/ScreenWrapper';
+import KeyboardAvoidingView from '../components/KeyboardAvoidingView';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import * as Browser from '../libs/Browser';
 import compose from '../libs/compose';
 import personalDetailsPropType from './personalDetailsPropType';
 import reportPropTypes from './reportPropTypes';
+import variables from '../styles/variables';
 
 const propTypes = {
-    /** Whether screen is used to create group chat */
-    isGroupChat: PropTypes.bool,
-
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -38,7 +37,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    isGroupChat: false,
     betas: [],
     personalDetails: {},
     reports: {},
@@ -46,7 +44,7 @@ const defaultProps = {
 
 const excludedGroupEmails = _.without(CONST.EXPENSIFY_EMAILS, CONST.EMAIL.CONCIERGE);
 
-function NewChatPage(props) {
+function NewChatPage({betas, isGroupChat, personalDetails, reports, translate}) {
     const [searchTerm, setSearchTerm] = useState('');
     const [filteredRecentReports, setFilteredRecentReports] = useState([]);
     const [filteredPersonalDetails, setFilteredPersonalDetails] = useState([]);
@@ -60,28 +58,26 @@ function NewChatPage(props) {
         searchTerm,
         maxParticipantsReached,
     );
-    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(props.personalDetails);
+    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
 
     const sections = useMemo(() => {
         const sectionsList = [];
         let indexOffset = 0;
 
-        if (props.isGroupChat) {
-            sectionsList.push({
-                title: undefined,
-                data: selectedOptions,
-                shouldShow: !_.isEmpty(selectedOptions),
-                indexOffset,
-            });
-            indexOffset += selectedOptions.length;
+        sectionsList.push({
+            title: undefined,
+            data: selectedOptions,
+            shouldShow: !_.isEmpty(selectedOptions),
+            indexOffset,
+        });
+        indexOffset += selectedOptions.length;
 
-            if (maxParticipantsReached) {
-                return sectionsList;
-            }
+        if (maxParticipantsReached) {
+            return sectionsList;
         }
 
         sectionsList.push({
-            title: props.translate('common.recents'),
+            title: translate('common.recents'),
             data: filteredRecentReports,
             shouldShow: !_.isEmpty(filteredRecentReports),
             indexOffset,
@@ -89,7 +85,7 @@ function NewChatPage(props) {
         indexOffset += filteredRecentReports.length;
 
         sectionsList.push({
-            title: props.translate('common.contacts'),
+            title: translate('common.contacts'),
             data: filteredPersonalDetails,
             shouldShow: !_.isEmpty(filteredPersonalDetails),
             indexOffset,
@@ -106,8 +102,7 @@ function NewChatPage(props) {
         }
 
         return sectionsList;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filteredPersonalDetails, filteredRecentReports, filteredUserToInvite, maxParticipantsReached, props.isGroupChat, selectedOptions]);
+    }, [translate, filteredPersonalDetails, filteredRecentReports, filteredUserToInvite, maxParticipantsReached, selectedOptions]);
 
     /**
      * Removes a selected option from list if already selected. If not already selected add this option to the list.
@@ -124,18 +119,15 @@ function NewChatPage(props) {
             newSelectedOptions = [...selectedOptions, option];
         }
 
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(
-            props.reports,
-            props.personalDetails,
-            props.betas,
-            searchTerm,
-            newSelectedOptions,
-            excludedGroupEmails,
-        );
+        const {
+            recentReports,
+            personalDetails: newChatPersonalDetails,
+            userToInvite,
+        } = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, searchTerm, newSelectedOptions, excludedGroupEmails);
 
         setSelectedOptions(newSelectedOptions);
         setFilteredRecentReports(recentReports);
-        setFilteredPersonalDetails(personalDetails);
+        setFilteredPersonalDetails(newChatPersonalDetails);
         setFilteredUserToInvite(userToInvite);
     }
 
@@ -154,9 +146,6 @@ function NewChatPage(props) {
      * or navigates to the existing chat if one with those participants already exists.
      */
     const createGroup = () => {
-        if (!props.isGroupChat) {
-            return;
-        }
         const logins = _.pluck(selectedOptions, 'login');
         if (logins.length < 1) {
             return;
@@ -165,49 +154,58 @@ function NewChatPage(props) {
     };
 
     useEffect(() => {
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(
-            props.reports,
-            props.personalDetails,
-            props.betas,
-            searchTerm,
-            selectedOptions,
-            props.isGroupChat ? excludedGroupEmails : [],
-        );
+        const {
+            recentReports,
+            personalDetails: newChatPersonalDetails,
+            userToInvite,
+        } = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, searchTerm, selectedOptions, isGroupChat ? excludedGroupEmails : []);
         setFilteredRecentReports(recentReports);
-        setFilteredPersonalDetails(personalDetails);
+        setFilteredPersonalDetails(newChatPersonalDetails);
         setFilteredUserToInvite(userToInvite);
-        // props.betas and props.isGroupChat are not added as dependencies since they don't change during the component lifecycle
+        // props.betas is not added as dependency since it doesn't change during the component lifecycle
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.reports, props.personalDetails, searchTerm]);
+    }, [reports, personalDetails, searchTerm]);
 
     return (
         <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
             includeSafeAreaPaddingBottom={false}
+            includePaddingTop={false}
             shouldEnableMaxHeight
         >
-            {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                <>
-                    <HeaderWithBackButton title={props.isGroupChat ? props.translate('sidebarScreen.newGroup') : props.translate('sidebarScreen.newChat')} />
+            {({safeAreaPaddingBottomStyle, insets}) => (
+                <KeyboardAvoidingView
+                    style={{height: '100%'}}
+                    behavior="padding"
+                    // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                    // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                    keyboardVerticalOffset={
+                        variables.contentHeaderHeight + insets.top + (Permissions.canUsePolicyRooms(betas) ? variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding : 0)
+                    }
+                >
                     <View style={[styles.flex1, styles.w100, styles.pRelative, selectedOptions.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
                         <OptionsSelector
-                            canSelectMultipleOptions={props.isGroupChat}
+                            canSelectMultipleOptions
+                            shouldShowMultipleOptionSelectorAsButton
+                            multipleOptionSelectorButtonText={translate('newChatPage.addToGroup')}
+                            onAddToSelection={(option) => toggleOption(option)}
                             sections={sections}
                             selectedOptions={selectedOptions}
                             value={searchTerm}
-                            onSelectRow={(option) => (props.isGroupChat ? toggleOption(option) : createChat(option))}
+                            onSelectRow={(option) => createChat(option)}
                             onChangeText={setSearchTerm}
                             headerMessage={headerMessage}
                             boldStyle
-                            shouldFocusOnSelectRow={props.isGroupChat && !Browser.isMobile()}
-                            shouldShowConfirmButton={props.isGroupChat}
-                            shouldShowOptions={didScreenTransitionEnd && isOptionsDataReady}
-                            confirmButtonText={props.translate('newChatPage.createGroup')}
+                            shouldFocusOnSelectRow={!Browser.isMobile()}
+                            shouldShowOptions={isOptionsDataReady}
+                            shouldShowConfirmButton
+                            confirmButtonText={selectedOptions.length > 1 ? translate('newChatPage.createGroup') : translate('newChatPage.createChat')}
                             onConfirmSelection={createGroup}
-                            textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
+                            textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         />
                     </View>
-                </>
+                </KeyboardAvoidingView>
             )}
         </ScreenWrapper>
     );
diff --git a/src/pages/NewChatSelectorPage.js b/src/pages/NewChatSelectorPage.js
new file mode 100755
index 000000000000..89a3fd1adc72
--- /dev/null
+++ b/src/pages/NewChatSelectorPage.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import OnyxTabNavigator, {TopTab} from '../libs/Navigation/OnyxTabNavigator';
+import TabSelector from '../components/TabSelector/TabSelector';
+import Navigation from '../libs/Navigation/Navigation';
+import Permissions from '../libs/Permissions';
+import NewChatPage from './NewChatPage';
+import WorkspaceNewRoomPage from './workspace/WorkspaceNewRoomPage';
+import CONST from '../CONST';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import ScreenWrapper from '../components/ScreenWrapper';
+import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
+import compose from '../libs/compose';
+
+const propTypes = {
+    ...windowDimensionsPropTypes,
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    betas: [],
+    personalDetails: {},
+    reports: {},
+};
+
+function NewChatSelectorPage(props) {
+    return (
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={props.translate('sidebarScreen.fabNewChat')}
+                onBackButtonPress={Navigation.dismissModal}
+            />
+            {Permissions.canUsePolicyRooms(props.betas) ? (
+                <OnyxTabNavigator
+                    id={CONST.TAB.NEW_CHAT_TAB_ID}
+                    tabBar={({state, navigation, position}) => (
+                        <TabSelector
+                            state={state}
+                            navigation={navigation}
+                            position={position}
+                        />
+                    )}
+                >
+                    <TopTab.Screen
+                        name={CONST.TAB.NEW_CHAT}
+                        component={NewChatPage}
+                    />
+                    <TopTab.Screen
+                        name={CONST.TAB.NEW_ROOM}
+                        component={WorkspaceNewRoomPage}
+                    />
+                </OnyxTabNavigator>
+            ) : (
+                <NewChatPage />
+            )}
+        </ScreenWrapper>
+    );
+}
+
+NewChatSelectorPage.propTypes = propTypes;
+NewChatSelectorPage.defaultProps = defaultProps;
+NewChatSelectorPage.displayName = 'NewChatPage';
+
+export default compose(withLocalize, withWindowDimensions)(NewChatSelectorPage);
diff --git a/src/pages/NewGroupPage.js b/src/pages/NewGroupPage.js
deleted file mode 100755
index 63f90016e63e..000000000000
--- a/src/pages/NewGroupPage.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import NewChatPage from './NewChatPage';
-
-function NewGroupPage(props) {
-    return (
-        <NewChatPage
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            isGroupChat
-        />
-    );
-}
-
-NewGroupPage.displayName = 'NewGroupPage';
-
-export default NewGroupPage;
diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js
new file mode 100644
index 000000000000..4cada83941ac
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js
@@ -0,0 +1,158 @@
+import React, {useState, useRef} from 'react';
+import PropTypes from 'prop-types';
+import {View, Keyboard} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import Str from 'expensify-common/lib/str';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+import _ from 'underscore';
+import withLocalize from '../../components/withLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import Navigation from '../../libs/Navigation/Navigation';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import ONYXKEYS from '../../ONYXKEYS';
+import TextInput from '../../components/TextInput';
+import CONST from '../../CONST';
+import Text from '../../components/Text';
+import Form from '../../components/Form';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import reportPropTypes from '../reportPropTypes';
+import personalDetailsPropType from '../personalDetailsPropType';
+import * as Report from '../../libs/actions/Report';
+import useLocalize from '../../hooks/useLocalize';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
+
+const propTypes = {
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session of currently logged in user */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
+    const {translate} = useLocalize();
+
+    // We need to edit the note in markdown format, but display it in HTML format
+    const parser = new ExpensiMark();
+    const [privateNote, setPrivateNote] = useState(parser.htmlToMarkdown(lodashGet(report, ['privateNotes', route.params.accountID, 'note'], '')).trim());
+    const isCurrentUserNote = Number(session.accountID) === Number(route.params.accountID);
+
+    // To focus on the input field when the page loads
+    const privateNotesInput = useRef(null);
+
+    const savePrivateNote = () => {
+        const editedNote = parser.replace(privateNote);
+        Report.updatePrivateNotes(report.reportID, route.params.accountID, editedNote);
+        Keyboard.dismiss();
+
+        // Take user back to the PrivateNotesView page
+        Navigation.goBack();
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(privateNotesInput.current)}
+        >
+            <FullPageNotFoundView
+                shouldShow={_.isEmpty(report) || _.isEmpty(report.privateNotes) || !_.has(report, ['privateNotes', route.params.accountID, 'note']) || !isCurrentUserNote}
+                subtitleKey="privateNotes.notesUnavailable"
+                onBackButtonPress={() => Navigation.goBack()}
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    subtitle="My note"
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <View style={[styles.flexGrow1, styles.ph5]}>
+                    <View style={[styles.mb5]}>
+                        <Text>
+                            {translate(
+                                Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
+                                    ? 'privateNotes.sharedNoteMessage'
+                                    : 'privateNotes.personalNoteMessage',
+                            )}
+                        </Text>
+                    </View>
+                    <Form
+                        formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
+                        onSubmit={savePrivateNote}
+                        submitButtonText={translate('common.save')}
+                        enabledWhenOffline
+                    >
+                        <OfflineWithFeedback
+                            errors={{
+                                ...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
+                            }}
+                            onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
+                            style={[styles.mb3]}
+                        >
+                            <TextInput
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                inputID="privateNotes"
+                                label={translate('privateNotes.composerLabel')}
+                                accessibilityLabel={translate('privateNotes.title')}
+                                autoCompleteType="off"
+                                autoCorrect={false}
+                                autoGrowHeight
+                                textAlignVertical="top"
+                                containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                defaultValue={privateNote}
+                                value={privateNote}
+                                onChangeText={(text) => setPrivateNote(text)}
+                                ref={(el) => (privateNotesInput.current = el)}
+                            />
+                        </OfflineWithFeedback>
+                    </Form>
+                </View>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesEditPage.displayName = 'PrivateNotesEditPage';
+PrivateNotesEditPage.propTypes = propTypes;
+PrivateNotesEditPage.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+)(PrivateNotesEditPage);
diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.js b/src/pages/PrivateNotes/PrivateNotesListPage.js
new file mode 100644
index 000000000000..5ea081a12f25
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.js
@@ -0,0 +1,158 @@
+import React, {useMemo, useEffect} from 'react';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import Navigation from '../../libs/Navigation/Navigation';
+import ONYXKEYS from '../../ONYXKEYS';
+import CONST from '../../CONST';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import MenuItem from '../../components/MenuItem';
+import useLocalize from '../../hooks/useLocalize';
+import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
+import * as Report from '../../libs/actions/Report';
+import personalDetailsPropType from '../personalDetailsPropType';
+import * as UserUtils from '../../libs/UserUtils';
+import reportPropTypes from '../reportPropTypes';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import {withNetwork} from '../../components/OnyxProvider';
+import networkPropTypes from '../../components/networkPropTypes';
+import ROUTES from '../../ROUTES';
+
+const propTypes = {
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session info for the currently logged in user. */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** Information about the network */
+    network: networkPropTypes.isRequired,
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesListPage({report, personalDetailsList, network, session}) {
+    const {translate} = useLocalize();
+
+    useEffect(() => {
+        if (network.isOffline) {
+            return;
+        }
+        Report.getReportPrivateNote(report.reportID);
+    }, [report.reportID, network.isOffline]);
+
+    /**
+     * Gets the menu item for each workspace
+     *
+     * @param {Object} item
+     * @param {Number} index
+     * @returns {JSX}
+     */
+    function getMenuItem(item, index) {
+        const keyTitle = item.translationKey ? translate(item.translationKey) : item.title;
+
+        return (
+            <OfflineWithFeedback
+                key={`${keyTitle}_${index}`}
+                pendingAction={item.pendingAction}
+                errorRowStyles={styles.ph5}
+                onClose={item.dismissError}
+                errors={item.errors}
+            >
+                <MenuItem
+                    title={keyTitle}
+                    icon={item.icon}
+                    iconType={CONST.ICON_TYPE_WORKSPACE}
+                    onPress={item.action}
+                    shouldShowRightIcon
+                    fallbackIcon={item.fallbackIcon}
+                    brickRoadIndicator={item.brickRoadIndicator}
+                />
+            </OfflineWithFeedback>
+        );
+    }
+
+    /**
+     * Returns a list of private notes on the given chat report
+     * @returns {Array} the menu item list
+     */
+    const privateNotes = useMemo(() => {
+        const privateNoteBrickRoadIndicator = (accountID) => (!_.isEmpty(lodashGet(report, ['privateNotes', accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '');
+        return _.chain(lodashGet(report, 'privateNotes', {}))
+            .map((privateNote, accountID) => ({
+                title: Number(lodashGet(session, 'accountID', null)) === Number(accountID) ? 'My note' : lodashGet(personalDetailsList, [accountID, 'login'], ''),
+                icon: UserUtils.getAvatar(lodashGet(personalDetailsList, [accountID, 'avatar'], UserUtils.getDefaultAvatar(accountID)), accountID),
+                iconType: CONST.ICON_TYPE_AVATAR,
+                action: () => Navigation.navigate(ROUTES.getPrivateNotesViewRoute(report.reportID, accountID)),
+                brickRoadIndicator: privateNoteBrickRoadIndicator(accountID),
+            }))
+            .value();
+    }, [report, personalDetailsList, session]);
+
+    return (
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <FullPageNotFoundView
+                shouldShow={_.isEmpty(report.reportID) || (!report.isLoadingPrivateNotes && network.isOffline && _.isEmpty(lodashGet(report, 'privateNotes', {})))}
+                onBackButtonPress={() => Navigation.goBack()}
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                {report.isLoadingPrivateNotes && _.isEmpty(lodashGet(report, 'privateNotes', {})) ? (
+                    <FullScreenLoadingIndicator />
+                ) : (
+                    _.map(privateNotes, (item, index) => getMenuItem(item, index))
+                )}
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesListPage.propTypes = propTypes;
+PrivateNotesListPage.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+    withNetwork(),
+)(PrivateNotesListPage);
diff --git a/src/pages/PrivateNotes/PrivateNotesViewPage.js b/src/pages/PrivateNotes/PrivateNotesViewPage.js
new file mode 100644
index 000000000000..86814ed4dc92
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesViewPage.js
@@ -0,0 +1,109 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {ScrollView} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import _ from 'underscore';
+import withLocalize from '../../components/withLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import Navigation from '../../libs/Navigation/Navigation';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import ONYXKEYS from '../../ONYXKEYS';
+import ROUTES from '../../ROUTES';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import reportPropTypes from '../reportPropTypes';
+import personalDetailsPropType from '../personalDetailsPropType';
+import useLocalize from '../../hooks/useLocalize';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import MenuItemWithTopDescription from '../../components/MenuItemWithTopDescription';
+import CONST from '../../CONST';
+
+const propTypes = {
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session of currently logged in user */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesViewPage({route, personalDetailsList, session, report}) {
+    const {translate} = useLocalize();
+    const isCurrentUserNote = Number(session.accountID) === Number(route.params.accountID);
+    const privateNote = lodashGet(report, ['privateNotes', route.params.accountID, 'note'], '');
+
+    return (
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <FullPageNotFoundView
+                shouldShow={_.isEmpty(report) || _.isEmpty(report.privateNotes) || !_.has(report, ['privateNotes', route.params.accountID, 'note'])}
+                subtitleKey="privateNotes.notesUnavailable"
+                onBackButtonPress={() => Navigation.goBack()}
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    subtitle={isCurrentUserNote ? 'My note' : `${lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')} note`}
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <ScrollView style={[styles.flexGrow1]}>
+                    <OfflineWithFeedback pendingAction={lodashGet(report, ['privateNotes', route.params.accountID, 'pendingAction'], null)}>
+                        <MenuItemWithTopDescription
+                            description={translate('privateNotes.composerLabel')}
+                            title={privateNote}
+                            onPress={() => isCurrentUserNote && Navigation.navigate(ROUTES.getPrivateNotesEditRoute(report.reportID, route.params.accountID))}
+                            shouldShowRightIcon={isCurrentUserNote}
+                            numberOfLinesTitle={0}
+                            shouldRenderAsHTML
+                            brickRoadIndicator={!_.isEmpty(lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                            disabled={!isCurrentUserNote}
+                            shouldGreyOutWhenDisabled={false}
+                        />
+                    </OfflineWithFeedback>
+                </ScrollView>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesViewPage.displayName = 'PrivateNotesViewPage';
+PrivateNotesViewPage.propTypes = propTypes;
+PrivateNotesViewPage.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+)(PrivateNotesViewPage);
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index b5ef85e14cbb..19f2b1fdc0c6 100755
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -36,6 +36,7 @@ import * as Illustrations from '../components/Icon/Illustrations';
 import variables from '../styles/variables';
 import * as ValidationUtils from '../libs/ValidationUtils';
 import Permissions from '../libs/Permissions';
+import ROUTES from '../ROUTES';
 
 const matchType = PropTypes.shape({
     params: PropTypes.shape({
@@ -140,6 +141,8 @@ function ProfilePage(props) {
 
     const navigateBackTo = lodashGet(props.route, 'params.backTo', '');
 
+    const chatReportWithCurrentUser = !isCurrentUser && !Session.isAnonymousUser() ? ReportUtils.getChatByParticipants([accountID]) : 0;
+
     return (
         <ScreenWrapper>
             <HeaderWithBackButton
@@ -235,6 +238,17 @@ function ProfilePage(props) {
                                 shouldShowRightIcon
                             />
                         )}
+                        {!_.isEmpty(chatReportWithCurrentUser) && (
+                            <MenuItem
+                                title={`${props.translate('privateNotes.title')}`}
+                                titleStyle={styles.flex1}
+                                icon={Expensicons.Pencil}
+                                onPress={() => Navigation.navigate(ROUTES.getPrivateNotesListRoute(chatReportWithCurrentUser.reportID))}
+                                wrapperStyle={styles.breakAll}
+                                shouldShowRightIcon
+                                brickRoadIndicator={Report.hasErrorInPrivateNotes(chatReportWithCurrentUser) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                            />
+                        )}
                     </ScrollView>
                 )}
                 {!hasMinimumDetails && isLoading && <FullScreenLoadingIndicator style={styles.flex1} />}
diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
index 1168a3ed271d..80c9257d367a 100644
--- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
@@ -103,6 +103,7 @@ function BankAccountPlaidStep(props) {
                     }}
                     plaidData={plaidData}
                     onExitPlaid={() => BankAccounts.setBankAccountSubStep(null)}
+                    onBlurPlaid={() => BankAccounts.setBankAccountSubStep(null)}
                     receivedRedirectURI={receivedRedirectURI}
                     plaidLinkOAuthToken={plaidLinkOAuthToken}
                     allowDebit
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index 8e718e193efe..74482ef612ed 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -11,7 +11,7 @@ import * as Expensicons from '../../components/Icon/Expensicons';
 import styles from '../../styles/styles';
 import TextLink from '../../components/TextLink';
 import Icon from '../../components/Icon';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import CONST from '../../CONST';
 import withLocalize from '../../components/withLocalize';
 import Text from '../../components/Text';
@@ -146,7 +146,7 @@ function BankAccountStep(props) {
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.m4]}>
                             <Icon
                                 src={Expensicons.Exclamation}
-                                fill={colors.red}
+                                fill={themeColors.danger}
                             />
                             <Text style={[styles.mutedTextLabel, styles.ml4, styles.flex1]}>{props.translate('bankAccount.validateAccountError')}</Text>
                         </View>
@@ -164,7 +164,7 @@ function BankAccountStep(props) {
                             <View style={[styles.ml1]}>
                                 <Icon
                                     src={Expensicons.Lock}
-                                    fill={colors.blue}
+                                    fill={themeColors.link}
                                 />
                             </View>
                         </PressableWithoutFeedback>
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index d76d10c9e52c..22133415cea8 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -224,7 +224,7 @@ function CompanyStep({reimbursementAccount, reimbursementAccountDraft, getDefaul
                     <Picker
                         inputID="incorporationType"
                         label={translate('companyStep.companyType')}
-                        items={_.map(translate('companyStep.incorporationTypes'), (label, value) => ({value, label}))}
+                        items={_.map(_.keys(CONST.INCORPORATION_TYPES), (key) => ({value: key, label: translate(`companyStep.incorporationTypes.${key}`)}))}
                         placeholder={{value: '', label: '-'}}
                         defaultValue={getDefaultStateForField('incorporationType')}
                         shouldSaveDraft
diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
index 361f0198402e..3a9e0f5c2eb8 100644
--- a/src/pages/ReportDetailsPage.js
+++ b/src/pages/ReportDetailsPage.js
@@ -112,6 +112,18 @@ function ReportDetailsPage(props) {
             });
         }
 
+        // Prevent displaying private notes option for threads and task reports
+        if (!isThread && !ReportUtils.isTaskReport(props.report)) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES,
+                translationKey: 'privateNotes.title',
+                icon: Expensicons.Pencil,
+                isAnonymousAction: false,
+                action: () => Navigation.navigate(ROUTES.getPrivateNotesListRoute(props.report.reportID)),
+                brickRoadIndicator: Report.hasErrorInPrivateNotes(props.report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '',
+            });
+        }
+
         if (isUserCreatedPolicyRoom || canLeaveRoom || isThread) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
@@ -123,7 +135,7 @@ function ReportDetailsPage(props) {
         }
 
         return items;
-    }, [props.report.reportID, participants, isArchivedRoom, shouldDisableSettings, isThread, isUserCreatedPolicyRoom, canLeaveRoom]);
+    }, [props.report, participants, isArchivedRoom, shouldDisableSettings, isThread, isUserCreatedPolicyRoom, canLeaveRoom]);
 
     const displayNamesWithTooltips = useMemo(() => {
         const hasMultipleParticipants = participants.length > 1;
@@ -154,8 +166,8 @@ function ReportDetailsPage(props) {
                                     fullTitle={ReportUtils.getReportName(props.report)}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
                                     tooltipEnabled
-                                    numberOfLines={isChatRoom ? 0 : 1}
-                                    textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom ? undefined : styles.pre]}
+                                    numberOfLines={isChatRoom && !isThread ? 0 : 1}
+                                    textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom && !isThread ? undefined : styles.pre]}
                                     shouldUseFullTitle={shouldUseFullTitle}
                                 />
                             </View>
@@ -187,7 +199,7 @@ function ReportDetailsPage(props) {
                                 onPress={item.action}
                                 isAnonymousAction={item.isAnonymousAction}
                                 shouldShowRightIcon
-                                brickRoadIndicator={brickRoadIndicator}
+                                brickRoadIndicator={brickRoadIndicator || item.brickRoadIndicator}
                             />
                         );
                     })}
diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 6505b604b614..2ee29380ff80 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -186,6 +186,7 @@ class SearchPage extends Component {
                                 textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                                 onLayout={this.searchRendered}
                                 safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                                autoFocus
                             />
                         </View>
                     </>
diff --git a/src/pages/TeachersUnite/ImTeacherPage.js b/src/pages/TeachersUnite/ImTeacherPage.js
index f077c7724978..dbeba700d208 100644
--- a/src/pages/TeachersUnite/ImTeacherPage.js
+++ b/src/pages/TeachersUnite/ImTeacherPage.js
@@ -22,7 +22,7 @@ function ImTeacherPage() {
         <ScreenWrapper>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iAmATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <BlockingView
                 shouldShowLink
diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
index 975f47456702..fe25c54cb8cc 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
@@ -18,6 +18,7 @@ import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 import TeachersUnite from '../../libs/actions/TeachersUnite';
 import useLocalize from '../../hooks/useLocalize';
+import * as ValidationUtils from '../../libs/ValidationUtils';
 
 const propTypes = {
     /** Login list for the user that is signed in */
@@ -53,10 +54,14 @@ function IntroSchoolPrincipalPage(props) {
         (values) => {
             const errors = {};
 
-            if (_.isEmpty(values.firstName)) {
+            if (!ValidationUtils.isValidLegalName(values.firstName)) {
+                ErrorUtils.addErrorMessage(errors, 'firstName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+            } else if (_.isEmpty(values.firstName)) {
                 ErrorUtils.addErrorMessage(errors, 'firstName', translate('bankAccount.error.firstName'));
             }
-            if (_.isEmpty(values.lastName)) {
+            if (!ValidationUtils.isValidLegalName(values.lastName)) {
+                ErrorUtils.addErrorMessage(errors, 'lastName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+            } else if (_.isEmpty(values.lastName)) {
                 ErrorUtils.addErrorMessage(errors, 'lastName', translate('bankAccount.error.lastName'));
             }
             if (_.isEmpty(values.partnerUserID)) {
@@ -78,7 +83,7 @@ function IntroSchoolPrincipalPage(props) {
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.introSchoolPrincipal')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <Form
                 enabledWhenOffline
diff --git a/src/pages/TeachersUnite/KnowATeacherPage.js b/src/pages/TeachersUnite/KnowATeacherPage.js
index d8b94d77535b..795bc170a83c 100644
--- a/src/pages/TeachersUnite/KnowATeacherPage.js
+++ b/src/pages/TeachersUnite/KnowATeacherPage.js
@@ -19,6 +19,7 @@ import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 import TeachersUnite from '../../libs/actions/TeachersUnite';
 import useLocalize from '../../hooks/useLocalize';
+import * as ValidationUtils from '../../libs/ValidationUtils';
 
 const propTypes = {
     /** Login list for the user that is signed in */
@@ -64,10 +65,14 @@ function KnowATeacherPage(props) {
             const phoneLogin = LoginUtils.getPhoneLogin(values.partnerUserID);
             const validateIfnumber = LoginUtils.validateNumber(phoneLogin);
 
-            if (_.isEmpty(values.firstName)) {
+            if (!ValidationUtils.isValidLegalName(values.firstName)) {
+                ErrorUtils.addErrorMessage(errors, 'firstName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+            } else if (_.isEmpty(values.firstName)) {
                 ErrorUtils.addErrorMessage(errors, 'firstName', translate('bankAccount.error.firstName'));
             }
-            if (_.isEmpty(values.lastName)) {
+            if (!ValidationUtils.isValidLegalName(values.lastName)) {
+                ErrorUtils.addErrorMessage(errors, 'lastName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+            } else if (_.isEmpty(values.lastName)) {
                 ErrorUtils.addErrorMessage(errors, 'lastName', translate('bankAccount.error.lastName'));
             }
             if (_.isEmpty(values.partnerUserID)) {
@@ -89,7 +94,7 @@ function KnowATeacherPage(props) {
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iKnowATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <Form
                 enabledWhenOffline
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 74994e4dc9d0..477d063c1747 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -20,7 +20,7 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import Text from '../../components/Text';
 import Tooltip from '../../components/Tooltip';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import reportPropTypes from '../reportPropTypes';
 import ONYXKEYS from '../../ONYXKEYS';
 import ThreeDotsMenu from '../../components/ThreeDotsMenu';
@@ -29,6 +29,7 @@ import reportActionPropTypes from './report/reportActionPropTypes';
 import PressableWithoutFeedback from '../../components/Pressable/PressableWithoutFeedback';
 import PinButton from '../../components/PinButton';
 import TaskHeaderActionButton from '../../components/TaskHeaderActionButton';
+import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
 import ParentNavigationSubtitle from '../../components/ParentNavigationSubtitle';
 
 const propTypes = {
@@ -93,12 +94,14 @@ function HeaderView(props) {
     const isConcierge = ReportUtils.hasSingleParticipant(props.report) && _.contains(participants, CONST.ACCOUNT_ID.CONCIERGE);
     const isAutomatedExpensifyAccount = ReportUtils.hasSingleParticipant(props.report) && ReportUtils.hasAutomatedExpensifyAccountIDs(participants);
     const guideCalendarLink = lodashGet(props.account, 'guideCalendarLink');
+    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+    const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(props.report, parentReportAction);
 
     // We hide the button when we are chatting with an automated Expensify account since it's not possible to contact
     // these users via alternative means. It is possible to request a call with Concierge so we leave the option for them.
     const shouldShowCallButton = (isConcierge && guideCalendarLink) || (!isAutomatedExpensifyAccount && !isTaskReport);
     const threeDotMenuItems = [];
-    if (isTaskReport) {
+    if (isTaskReport && !isCanceledTaskReport) {
         const canModifyTask = Task.canModifyTask(props.report, props.session.accountID);
         if (ReportUtils.isOpenTaskReport(props.report) && canModifyTask) {
             threeDotMenuItems.push({
@@ -209,7 +212,7 @@ function HeaderView(props) {
                                 <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                     <Icon
                                         src={Expensicons.DotIndicator}
-                                        fill={colors.red}
+                                        fill={themeColors.danger}
                                     />
                                 </View>
                             )}
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 6daa15785921..8528b8f213a9 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -1,5 +1,6 @@
 import React, {useRef, useState, useEffect, useMemo, useCallback} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import lodashGet from 'lodash/get';
@@ -37,6 +38,8 @@ import ReportScreenContext from './ReportScreenContext';
 import TaskHeaderActionButton from '../../components/TaskHeaderActionButton';
 import DragAndDropProvider from '../../components/DragAndDrop/Provider';
 import usePrevious from '../../hooks/usePrevious';
+import CONST from '../../CONST';
+import withCurrentReportID, {withCurrentReportIDPropTypes, withCurrentReportIDDefaultProps} from '../../components/withCurrentReportID';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -88,6 +91,7 @@ const propTypes = {
 
     ...windowDimensionsPropTypes,
     ...viewportOffsetTopPropTypes,
+    ...withCurrentReportIDPropTypes,
 };
 
 const defaultProps = {
@@ -102,8 +106,18 @@ const defaultProps = {
     policies: {},
     accountManagerReportID: null,
     personalDetails: {},
+    ...withCurrentReportIDDefaultProps,
 };
 
+/**
+ *
+ * Function to check weather the report available in props is default
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+const checkDefaultReport = (report) => report === defaultProps.report;
+
 /**
  * Get the currently viewed report ID as number
  *
@@ -131,6 +145,7 @@ function ReportScreen({
     viewportOffsetTop,
     isComposerFullSize,
     errors,
+    currentReportID,
 }) {
     const firstRenderRef = useRef(true);
     const flatListRef = useRef();
@@ -147,6 +162,8 @@ function ReportScreen({
     // There are no reportActions at all to display and we are still in the process of loading the next set of actions.
     const isLoadingInitialReportActions = _.isEmpty(reportActions) && report.isLoadingReportActions;
 
+    const isOptimisticDelete = lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.CLOSED;
+
     const shouldHideReport = !ReportUtils.canAccessReport(report, policies, betas);
 
     const isLoading = !reportID || !isSidebarLoaded || _.isEmpty(personalDetails) || firstRenderRef.current;
@@ -157,7 +174,9 @@ function ReportScreen({
 
     const policy = policies[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
 
-    const isTopMostReportId = Navigation.getTopmostReportId() === getReportID(route);
+    const isTopMostReportId = currentReportID === getReportID(route);
+
+    const isDefaultReport = checkDefaultReport(report);
 
     let headerView = (
         <HeaderView
@@ -241,25 +260,28 @@ function ReportScreen({
         [route],
     );
 
-    useEffect(() => {
-        const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
-            // If the report is not fully visible (AKA on small screen devices and LHR is open) or the report is optimistic (AKA not yet created)
-            // we don't need to call openReport
-            if (!getIsReportFullyVisible(isTopMostReportId) || report.isOptimisticReport) {
-                return;
-            }
-
-            Report.openReport(report.reportID);
-        });
+    useFocusEffect(
+        useCallback(() => {
+            const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+                const isTopMostReportID = Navigation.getTopmostReportId() === getReportID(route);
+                // If the report is not fully visible (AKA on small screen devices and LHR is open) or the report is optimistic (AKA not yet created)
+                // we don't need to call openReport
+                if (!getIsReportFullyVisible(isTopMostReportID) || report.isOptimisticReport) {
+                    return;
+                }
+
+                Report.openReport(report.reportID);
+            });
+
+            return () => unsubscribeVisibilityListener();
+            // The effect should run only on the first focus to attach listener
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }, []),
+    );
 
+    useEffect(() => {
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);
-        return () => {
-            if (!unsubscribeVisibilityListener) {
-                return;
-            }
-            unsubscribeVisibilityListener();
-        };
         // I'm disabling the warning, as it expects to use exhaustive deps, even though we want this useEffect to run only on the first render.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -284,6 +306,12 @@ function ReportScreen({
         ComposerActions.setShouldShowComposeInput(true);
     }, [route, report, errors, fetchReportIfNeeded, prevReport.reportID]);
 
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useMemo(
+        () => (!_.isEmpty(report) && !isDefaultReport && !report.reportID && !isOptimisticDelete && !report.isLoadingReportActions && !isLoading) || shouldHideReport,
+        [report, isLoading, shouldHideReport, isDefaultReport, isOptimisticDelete],
+    );
+
     return (
         <ReportScreenContext.Provider
             value={{
@@ -296,7 +324,7 @@ function ReportScreen({
                 shouldEnableKeyboardAvoidingView={isTopMostReportId}
             >
                 <FullPageNotFoundView
-                    shouldShow={(!report.reportID && !report.isLoadingReportActions && !isLoading) || shouldHideReport}
+                    shouldShow={shouldShowNotFoundPage}
                     subtitleKey="notFound.noAccess"
                     shouldShowCloseButton={false}
                     shouldShowBackButton={isSmallScreenWidth}
@@ -310,7 +338,7 @@ function ReportScreen({
                         needsOffscreenAlphaCompositing
                     >
                         {headerView}
-                        {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report) && (
+                        {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
                             <View style={[styles.borderBottom]}>
                                 <View style={[styles.appBG, styles.pl0]}>
                                     <View style={[styles.ph5, styles.pb3]}>
@@ -396,6 +424,7 @@ export default compose(
     withLocalize,
     withWindowDimensions,
     withNetwork(),
+    withCurrentReportID,
     withOnyx({
         isSidebarLoaded: {
             key: ONYXKEYS.IS_SIDEBAR_LOADED,
diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
index 362ce23f72ba..3f4a5fe3ac4c 100755
--- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
@@ -1,7 +1,9 @@
-import React, {useState} from 'react';
+import React, {useMemo, useState, memo} from 'react';
 import {InteractionManager, View} from 'react-native';
+import lodashGet from 'lodash/get';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
 import getReportActionContextMenuStyles from '../../../../styles/getReportActionContextMenuStyles';
 import ContextMenuItem from '../../../../components/ContextMenuItem';
 import {propTypes as genericReportActionContextMenuPropTypes, defaultProps as GenericReportActionContextMenuDefaultProps} from './genericReportActionContextMenuPropTypes';
@@ -12,6 +14,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../../../compo
 import {withBetas} from '../../../../components/OnyxProvider';
 import * as Session from '../../../../libs/actions/Session';
 import {hideContextMenu} from './ReportActionContextMenu';
+import ONYXKEYS from '../../../../ONYXKEYS';
 
 const propTypes = {
     /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices  */
@@ -44,18 +47,14 @@ const defaultProps = {
 function BaseReportActionContextMenu(props) {
     const [shouldKeepOpen, setShouldKeepOpen] = useState(false);
     const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth);
+
+    const reportAction = useMemo(() => {
+        if (_.isEmpty(props.reportActions) || props.reportActionID === '0') return {};
+        return props.reportActions[props.reportActionID] || {};
+    }, [props.reportActions, props.reportActionID]);
+
     const shouldShowFilter = (contextAction) =>
-        contextAction.shouldShow(
-            props.type,
-            props.reportAction,
-            props.isArchivedRoom,
-            props.betas,
-            props.anchor,
-            props.isChronosReport,
-            props.reportID,
-            props.isPinnedChat,
-            props.isUnreadChat,
-        );
+        contextAction.shouldShow(props.type, reportAction, props.isArchivedRoom, props.betas, props.anchor, props.isChronosReport, props.reportID, props.isPinnedChat, props.isUnreadChat);
 
     /**
      * Checks if user is anonymous. If true and the action doesn't accept for anonymous user, hides the context menu and
@@ -85,7 +84,7 @@ function BaseReportActionContextMenu(props) {
                 {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction) => {
                     const closePopup = !props.isMini;
                     const payload = {
-                        reportAction: props.reportAction,
+                        reportAction,
                         reportID: props.reportID,
                         draftMessage: props.draftMessage,
                         selection: props.selection,
@@ -106,7 +105,7 @@ function BaseReportActionContextMenu(props) {
                     return (
                         <ContextMenuItem
                             icon={contextAction.icon}
-                            text={props.translate(contextAction.textTranslateKey, {action: props.reportAction})}
+                            text={props.translate(contextAction.textTranslateKey, {action: reportAction})}
                             successIcon={contextAction.successIcon}
                             successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined}
                             isMini={props.isMini}
@@ -125,4 +124,25 @@ function BaseReportActionContextMenu(props) {
 BaseReportActionContextMenu.propTypes = propTypes;
 BaseReportActionContextMenu.defaultProps = defaultProps;
 
-export default compose(withLocalize, withBetas(), withWindowDimensions)(BaseReportActionContextMenu);
+export default compose(
+    withLocalize,
+    withBetas(),
+    withWindowDimensions,
+    withOnyx({
+        reportActions: {
+            key: ({originalReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
+            canEvict: false,
+        },
+    }),
+)(
+    memo(BaseReportActionContextMenu, (prevProps, nextProps) => {
+        const prevReportAction = lodashGet(prevProps.reportActions, prevProps.reportActionID, '');
+        const nextReportAction = lodashGet(nextProps.reportActions, nextProps.reportActionID, '');
+
+        // We only want to re-render when the report action that is attached to is changed
+        if (prevReportAction !== nextReportAction) {
+            return false;
+        }
+        return _.isEqual(_.omit(prevProps, 'reportActions'), _.omit(nextProps, 'reportActions'));
+    }),
+);
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index bac79e1863e5..06ece96df0af 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -10,7 +10,7 @@ import * as ReportUtils from '../../../../libs/ReportUtils';
 import * as ReportActionsUtils from '../../../../libs/ReportActionsUtils';
 import * as PersonalDetailsUtils from '../../../../libs/PersonalDetailsUtils';
 import ReportActionComposeFocusManager from '../../../../libs/ReportActionComposeFocusManager';
-import {hideContextMenu, showDeleteModal} from './ReportActionContextMenu';
+import {hideContextMenu, showDeleteModal, clearActiveReportAction} from './ReportActionContextMenu';
 import CONST from '../../../../CONST';
 import getAttachmentDetails from '../../../../libs/fileDownload/getAttachmentDetails';
 import fileDownload from '../../../../libs/fileDownload';
@@ -21,6 +21,7 @@ import QuickEmojiReactions from '../../../../components/Reactions/QuickEmojiReac
 import MiniQuickEmojiReactions from '../../../../components/Reactions/MiniQuickEmojiReactions';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
+import * as Task from '../../../../libs/actions/Task';
 
 /**
  * Gets the HTML version of the message in an action.
@@ -95,9 +96,9 @@ export default [
         successTextTranslateKey: 'common.download',
         successIcon: Expensicons.Download,
         shouldShow: (type, reportAction) => {
-            const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
-            return isAttachment && message.html !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
+            const messageHtml = lodashGet(reportAction, ['message', 0, 'html']);
+            return isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction);
         },
         onPress: (closePopover, {reportAction}) => {
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
@@ -175,21 +176,20 @@ export default [
         successTextTranslateKey: 'reportActionContextMenu.copied',
         successIcon: Expensicons.Checkmark,
         shouldShow: (type, reportAction) =>
-            type === CONTEXT_MENU_TYPES.REPORT_ACTION &&
-            !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))) &&
-            !ReportActionsUtils.isMessageDeleted(reportAction),
+            type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportActionsUtils.isReportActionAttachment(reportAction) && !ReportActionsUtils.isMessageDeleted(reportAction),
 
         // If return value is true, we switch the `text` and `icon` on
         // `ContextMenuItem` with `successText` and `successIcon` which will fallback to
         // the `text` and `icon`
         onPress: (closePopover, {reportAction, selection}) => {
             const isTaskAction = ReportActionsUtils.isTaskAction(reportAction);
+            const isCreateTaskAction = ReportActionsUtils.isCreatedTaskReportAction(reportAction);
             const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const originalMessage = _.get(reportAction, 'originalMessage', {});
-            const messageHtml = isTaskAction ? lodashGet(originalMessage, 'html', '') : lodashGet(message, 'html', '');
+            const reportID = lodashGet(reportAction, 'originalMessage.taskReportID', '').toString();
+            const messageHtml = isTaskAction || isCreateTaskAction ? Task.getTaskReportActionMessage(reportAction.actionName, reportID, isCreateTaskAction) : lodashGet(message, 'html', '');
 
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
             if (!isAttachment) {
                 const content = selection || messageHtml;
                 if (isReportPreviewAction) {
@@ -208,9 +208,8 @@ export default [
                         Clipboard.setHtml(content, plainText);
                     }
                 }
-            } else {
-                Clipboard.setString(messageHtml);
             }
+
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
             }
@@ -225,8 +224,7 @@ export default [
         successIcon: Expensicons.Checkmark,
         successTextTranslateKey: 'reportActionContextMenu.copied',
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget) => {
-            const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
 
             // Only hide the copylink menu item when context menu is opened over img element.
             const isAttachmentTarget = lodashGet(menuTarget, 'tagName') === 'IMG' && isAttachment;
@@ -321,12 +319,12 @@ export default [
         onPress: (closePopover, {reportID, reportAction}) => {
             if (closePopover) {
                 // Hide popover, then call showDeleteConfirmModal
-                hideContextMenu(false, () => showDeleteModal(reportID, reportAction));
+                hideContextMenu(false, () => showDeleteModal(reportID, reportAction, true, clearActiveReportAction, clearActiveReportAction));
                 return;
             }
 
             // No popover to hide, call showDeleteConfirmModal immediately
-            showDeleteModal(reportID, reportAction);
+            showDeleteModal(reportID, reportAction, true, clearActiveReportAction, clearActiveReportAction);
         },
         getDescription: () => {},
     },
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
index 81858564b416..dd0813132a8e 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -21,6 +21,8 @@ class PopoverReportActionContextMenu extends React.Component {
 
         this.state = {
             reportID: '0',
+            reportActionID: '0',
+            originalReportID: '0',
             reportAction: {},
             selection: '',
             reportActionDraftMessage: '',
@@ -56,6 +58,7 @@ class PopoverReportActionContextMenu extends React.Component {
         this.runAndResetOnPopoverHide = this.runAndResetOnPopoverHide.bind(this);
         this.getContextMenuMeasuredLocation = this.getContextMenuMeasuredLocation.bind(this);
         this.isActiveReportAction = this.isActiveReportAction.bind(this);
+        this.clearActiveReportAction = this.clearActiveReportAction.bind(this);
 
         this.dimensionsEventListener = null;
 
@@ -112,7 +115,11 @@ class PopoverReportActionContextMenu extends React.Component {
      * @return {Boolean}
      */
     isActiveReportAction(actionID) {
-        return Boolean(actionID) && this.state.reportAction.reportActionID === actionID;
+        return Boolean(actionID) && (this.state.reportActionID === actionID || this.state.reportAction.reportActionID === actionID);
+    }
+
+    clearActiveReportAction() {
+        this.setState({reportID: '0', reportAction: {}});
     }
 
     /**
@@ -123,7 +130,8 @@ class PopoverReportActionContextMenu extends React.Component {
      * @param {String} [selection] - Copied content.
      * @param {Element} contextMenuAnchor - popoverAnchor
      * @param {String} reportID - Active Report Id
-     * @param {Object} reportAction - ReportAction for ContextMenu
+     * @param {Object} reportActionID - ReportAction for ContextMenu
+     * @param {String} originalReportID - The currrent Report Id of the reportAction
      * @param {String} draftMessage - ReportAction Draftmessage
      * @param {Function} [onShow] - Run a callback when Menu is shown
      * @param {Function} [onHide] - Run a callback when Menu is hidden
@@ -138,7 +146,8 @@ class PopoverReportActionContextMenu extends React.Component {
         selection,
         contextMenuAnchor,
         reportID,
-        reportAction,
+        reportActionID,
+        originalReportID,
         draftMessage,
         onShow = () => {},
         onHide = () => {},
@@ -170,7 +179,8 @@ class PopoverReportActionContextMenu extends React.Component {
                 },
                 type,
                 reportID,
-                reportAction,
+                reportActionID,
+                originalReportID,
                 selection,
                 isPopoverVisible: true,
                 reportActionDraftMessage: draftMessage,
@@ -216,7 +226,7 @@ class PopoverReportActionContextMenu extends React.Component {
      * After Popover hides, call the registered onPopoverHide & onPopoverHideActionCallback callback and reset it
      */
     runAndResetOnPopoverHide() {
-        this.setState({reportID: '0', reportAction: {}}, () => {
+        this.setState({reportID: '0', reportActionID: '0', originalReportID: '0'}, () => {
             this.onPopoverHide = this.runAndResetCallback(this.onPopoverHide);
             this.onPopoverHideActionCallback = this.runAndResetCallback(this.onPopoverHideActionCallback);
         });
@@ -310,7 +320,7 @@ class PopoverReportActionContextMenu extends React.Component {
                         isVisible
                         type={this.state.type}
                         reportID={this.state.reportID}
-                        reportAction={this.state.reportAction}
+                        reportActionID={this.state.reportActionID}
                         draftMessage={this.state.reportActionDraftMessage}
                         selection={this.state.selection}
                         isArchivedRoom={this.state.isArchivedRoom}
@@ -319,6 +329,7 @@ class PopoverReportActionContextMenu extends React.Component {
                         isUnreadChat={this.state.isUnreadChat}
                         anchor={this.contextMenuTargetNode}
                         contentRef={this.contentRef}
+                        originalReportID={this.state.originalReportID}
                     />
                 </PopoverWithMeasuredContent>
                 <ConfirmModal
@@ -327,10 +338,7 @@ class PopoverReportActionContextMenu extends React.Component {
                     shouldSetModalVisibility={this.state.shouldSetModalVisibilityForDeleteConfirmation}
                     onConfirm={this.confirmDeleteAndHideModal}
                     onCancel={this.hideDeleteModal}
-                    onModalHide={() => {
-                        this.setState({reportID: '0', reportAction: {}});
-                        this.callbackWhenDeleteModalHide();
-                    }}
+                    onModalHide={this.callbackWhenDeleteModalHide}
                     prompt={this.props.translate('reportActionContextMenu.deleteConfirmation', {action: this.state.reportAction})}
                     confirmText={this.props.translate('common.delete')}
                     cancelText={this.props.translate('common.cancel')}
diff --git a/src/pages/home/report/ContextMenu/ReportActionContextMenu.js b/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
index de495e3b9d1d..9467ff19b2f5 100644
--- a/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
@@ -39,7 +39,8 @@ function hideContextMenu(shouldDelay, onHideCallback = () => {}) {
  * @param {String} [selection] - Copied content.
  * @param {Element} contextMenuAnchor - popoverAnchor
  * @param {String} reportID - Active Report Id
- * @param {Object} reportAction - ReportAction for ContextMenu
+ * @param {String} reportActionID - ReportActionID for ContextMenu
+ * @param {String} originalReportID - The currrent Report Id of the reportAction
  * @param {String} draftMessage - ReportAction Draftmessage
  * @param {Function} [onShow=() => {}] - Run a callback when Menu is shown
  * @param {Function} [onHide=() => {}] - Run a callback when Menu is hidden
@@ -54,7 +55,8 @@ function showContextMenu(
     selection,
     contextMenuAnchor,
     reportID = '0',
-    reportAction = {},
+    reportActionID = '0',
+    originalReportID = '0',
     draftMessage = '',
     onShow = () => {},
     onHide = () => {},
@@ -72,13 +74,15 @@ function showContextMenu(
         hideContextMenu();
         contextMenuRef.current.runAndResetOnPopoverHide();
     }
+
     contextMenuRef.current.showContextMenu(
         type,
         event,
         selection,
         contextMenuAnchor,
         reportID,
-        reportAction,
+        reportActionID,
+        originalReportID,
         draftMessage,
         onShow,
         onHide,
@@ -124,4 +128,11 @@ function isActiveReportAction(actionID) {
     return contextMenuRef.current.isActiveReportAction(actionID);
 }
 
-export {contextMenuRef, showContextMenu, hideContextMenu, isActiveReportAction, showDeleteModal, hideDeleteModal};
+function clearActiveReportAction() {
+    if (!contextMenuRef.current) {
+        return;
+    }
+    return contextMenuRef.current.clearActiveReportAction();
+}
+
+export {contextMenuRef, showContextMenu, hideContextMenu, isActiveReportAction, clearActiveReportAction, showDeleteModal, hideDeleteModal};
diff --git a/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js b/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
index f62873031c54..3d8667e44e62 100644
--- a/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
+++ b/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
@@ -1,12 +1,14 @@
 import PropTypes from 'prop-types';
-import reportActionPropTypes from '../reportActionPropTypes';
 
 const propTypes = {
     /** The ID of the report this report action is attached to. */
     reportID: PropTypes.string.isRequired,
 
-    /** The report action this context menu is attached to. */
-    reportAction: PropTypes.shape(reportActionPropTypes).isRequired,
+    /** The ID of the report action this context menu is attached to. */
+    reportActionID: PropTypes.string.isRequired,
+
+    /** The ID of the original report from which the given reportAction is first created. */
+    originalReportID: PropTypes.string.isRequired,
 
     /** If true, this component will be a small, row-oriented menu that displays icons but not text.
     If false, this component will be a larger, column-oriented menu that displays icons alongside text in each row. */
diff --git a/src/pages/home/report/FloatingMessageCounter/index.js b/src/pages/home/report/FloatingMessageCounter/index.js
index 73fe02df129b..a4e2d25d9490 100644
--- a/src/pages/home/report/FloatingMessageCounter/index.js
+++ b/src/pages/home/report/FloatingMessageCounter/index.js
@@ -1,6 +1,7 @@
 import React, {useEffect, useMemo, useCallback} from 'react';
 import {Animated, View} from 'react-native';
 import PropTypes from 'prop-types';
+import CONST from '../../../../CONST';
 import styles from '../../../../styles/styles';
 import Button from '../../../../components/Button';
 import Text from '../../../../components/Text';
@@ -9,6 +10,7 @@ import * as Expensicons from '../../../../components/Icon/Expensicons';
 import themeColors from '../../../../styles/themes/default';
 import useLocalize from '../../../../hooks/useLocalize';
 import FloatingMessageCounterContainer from './FloatingMessageCounterContainer';
+import useNativeDriver from '../../../../libs/useNativeDriver';
 
 const propTypes = {
     /** Whether the New Messages indicator is active */
@@ -34,7 +36,7 @@ function FloatingMessageCounter(props) {
         Animated.spring(translateY, {
             toValue: MARKER_ACTIVE_TRANSLATE_Y,
             duration: 80,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [translateY]);
 
@@ -42,7 +44,7 @@ function FloatingMessageCounter(props) {
         Animated.spring(translateY, {
             toValue: MARKER_INACTIVE_TRANSLATE_Y,
             duration: 80,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [translateY]);
 
@@ -75,6 +77,7 @@ function FloatingMessageCounter(props) {
                             <Text
                                 selectable={false}
                                 style={[styles.ml2, styles.buttonSmallText, styles.textWhite]}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {translate('newMessages')}
                             </Text>
diff --git a/src/pages/home/report/LinkPreviewer.js b/src/pages/home/report/LinkPreviewer.js
index 7c88e9d54126..4fcbb0dc0569 100644
--- a/src/pages/home/report/LinkPreviewer.js
+++ b/src/pages/home/report/LinkPreviewer.js
@@ -8,7 +8,7 @@ import TextLink from '../../../components/TextLink';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import styles from '../../../styles/styles';
 import variables from '../../../styles/variables';
-import colors from '../../../styles/colors';
+import themeColors from '../../../styles/themes/default';
 
 const IMAGE_TYPES = ['jpg', 'jpeg', 'png'];
 const MAX_IMAGE_HEIGHT = 180;
@@ -99,7 +99,7 @@ function LinkPreviewer(props) {
                         {!_.isEmpty(title) && (
                             <TextLink
                                 fontSize={variables.fontSizeNormal}
-                                style={[styles.mv2, StyleUtils.getTextColorStyle(colors.blueLinkPreview), styles.alignSelfStart]}
+                                style={[styles.mv2, StyleUtils.getTextColorStyle(themeColors.link), styles.alignSelfStart]}
                                 href={url}
                             >
                                 {title}
diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js
index 9303d7a5bc39..a721ab31b78e 100644
--- a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js
+++ b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js
@@ -198,6 +198,9 @@ class BasePopoverReactionList extends React.Component {
      * Hide the ReactionList modal popover.
      */
     hideReactionList() {
+        if (!this.state.isPopoverVisible) {
+            return;
+        }
         this.setState({
             isPopoverVisible: false,
         });
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
index 5864b9b05023..6dd3355f4a53 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
@@ -76,6 +76,9 @@ const propTypes = {
     /** Called when the add action button is pressed */
     onAddActionPressed: PropTypes.func.isRequired,
 
+    /** Called when the menu item is selected */
+    onItemSelected: PropTypes.func.isRequired,
+
     /** A ref for the add action button */
     actionButtonRef: PropTypes.shape({
         // eslint-disable-next-line react/forbid-prop-types
@@ -111,6 +114,7 @@ function AttachmentPickerWithMenuItems({
     onCanceledAttachmentPicker,
     onMenuClosed,
     onAddActionPressed,
+    onItemSelected,
     actionButtonRef,
 }) {
     const {translate} = useLocalize();
@@ -257,6 +261,7 @@ function AttachmentPickerWithMenuItems({
                             onClose={onPopoverMenuClose}
                             onItemSelected={(item, index) => {
                                 setMenuVisibility(false);
+                                onItemSelected();
 
                                 // In order for the file picker to open dynamically, the click
                                 // function must be called from within a event handler that was initiated
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
index 36b0af156ae5..04757b0ff276 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
@@ -305,7 +305,7 @@ function ComposerWithSuggestions({
 
     const onSelectionChange = useCallback(
         (e) => {
-            if (suggestionsRef.current.onSelectionChange(e)) {
+            if (textInputRef.current && textInputRef.current.isFocused() && suggestionsRef.current.onSelectionChange(e)) {
                 return;
             }
 
@@ -321,11 +321,11 @@ function ComposerWithSuggestions({
         suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
     }, [suggestionsRef]);
 
-    const setShouldBlockSuggestionCalc = useCallback(() => {
+    const setShouldBlockSuggestionCalcToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
             return false;
         }
-        return suggestionsRef.current.setShouldBlockSuggestionCalc(true);
+        return suggestionsRef.current.setShouldBlockSuggestionCalc(false);
     }, [suggestionsRef]);
 
     /**
@@ -353,9 +353,10 @@ function ComposerWithSuggestions({
      * @returns {Boolean}
      */
     const checkComposerVisibility = useCallback(() => {
-        const isComposerCoveredUp = EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible;
+        // Checking whether the screen is focused or not, helps avoid `modal.isVisible` false when popups are closed, even if the modal is opened.
+        const isComposerCoveredUp = !isFocused || EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible || modal.willAlertModalBecomeVisible;
         return !isComposerCoveredUp;
-    }, [isMenuVisible, modal.isVisible]);
+    }, [isMenuVisible, modal, isFocused]);
 
     const focusComposerOnKeyPress = useCallback(
         (e) => {
@@ -471,7 +472,7 @@ function ComposerWithSuggestions({
                     maxLines={maxComposerLines}
                     onFocus={onFocus}
                     onBlur={onBlur}
-                    onClick={setShouldBlockSuggestionCalc}
+                    onClick={setShouldBlockSuggestionCalcToFalse}
                     onPasteFile={displayFileInModal}
                     shouldClear={textInputShouldClear}
                     onClear={() => setTextInputShouldClear(false)}
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
index 791d7db97070..ddcd43cd8cd0 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -4,7 +4,6 @@ import {View} from 'react-native';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
-import {useNavigation} from '@react-navigation/native';
 import {useAnimatedRef} from 'react-native-reanimated';
 import styles from '../../../../styles/styles';
 import ONYXKEYS from '../../../../ONYXKEYS';
@@ -28,7 +27,6 @@ import ExceededCommentLength from '../../../../components/ExceededCommentLength'
 import ReportDropUI from '../ReportDropUI';
 import reportPropTypes from '../../../reportPropTypes';
 import OfflineWithFeedback from '../../../../components/OfflineWithFeedback';
-import * as Welcome from '../../../../libs/actions/Welcome';
 import SendButton from './SendButton';
 import AttachmentPickerWithMenuItems from './AttachmentPickerWithMenuItems';
 import ComposerWithSuggestions from './ComposerWithSuggestions';
@@ -77,7 +75,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    modal: {},
     report: {},
     blockedFromConcierge: {},
     personalDetails: {},
@@ -110,7 +107,6 @@ function ReportActionCompose({
     isCommentEmpty: isCommentEmptyProp,
 }) {
     const {translate} = useLocalize();
-    const navigation = useNavigation();
     const {isMediumScreenWidth, isSmallScreenWidth} = useWindowDimensions();
     const animatedRef = useAnimatedRef();
     const actionButtonRef = useRef(null);
@@ -149,7 +145,6 @@ function ReportActionCompose({
         () => _.without(lodashGet(report, 'participantAccountIDs', []), currentUserPersonalDetails.accountID),
         [currentUserPersonalDetails.accountID, report],
     );
-    const participantsWithoutExpensifyAccountIDs = useMemo(() => _.difference(reportParticipantIDs, CONST.EXPENSIFY_ACCOUNT_IDS), [reportParticipantIDs]);
 
     const shouldShowReportRecipientLocalTime = useMemo(
         () => ReportUtils.canShowReportRecipientLocalTime(personalDetails, report, currentUserPersonalDetails.accountID) && !isComposerFullSize,
@@ -209,6 +204,10 @@ function ReportActionCompose({
         composerRef.current.blur();
     }, []);
 
+    const onItemSelected = useCallback(() => {
+        isKeyboardVisibleWhenShowingModalRef.current = false;
+    }, []);
+
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
             return;
@@ -275,11 +274,14 @@ function ReportActionCompose({
             suggestionsRef.current.setShouldBlockSuggestionCalc(true);
         }
         isNextModalWillOpenRef.current = true;
+        isKeyboardVisibleWhenShowingModalRef.current = true;
     }, []);
 
     const onBlur = useCallback((e) => {
         setIsFocused(false);
-        suggestionsRef.current.resetSuggestions();
+        if (suggestionsRef.current) {
+            suggestionsRef.current.resetSuggestions();
+        }
         if (e.relatedTarget && e.relatedTarget === actionButtonRef.current) {
             isKeyboardVisibleWhenShowingModalRef.current = true;
         }
@@ -289,34 +291,29 @@ function ReportActionCompose({
         setIsFocused(true);
     }, []);
 
-    /**
-     * Used to show Popover menu on Workspace chat at first sign-in
-     * @returns {Boolean}
-     */
-    const showPopoverMenu = useCallback(() => {
-        setMenuVisibility(true);
-        return true;
-    }, []);
-
-    useEffect(() => {
-        // Shows Popover Menu on Workspace Chat at first sign-in
-        if (!disabled) {
-            Welcome.show({
-                routes: lodashGet(navigation.getState(), 'routes', []),
-                showPopoverMenu,
-            });
+    // resets the composer to normal size when
+    // the send button is pressed.
+    const resetFullComposerSize = useCallback(() => {
+        if (isComposerFullSize) {
+            Report.setIsComposerFullSize(reportID, false);
         }
+        setIsFullComposerAvailable(false);
+    }, [isComposerFullSize, reportID]);
 
-        return () => {
+    // We are returning a callback here as we want to incoke the method on unmount only
+    useEffect(
+        () => () => {
             if (!EmojiPickerActions.isActive(report.reportID)) {
                 return;
             }
             EmojiPickerActions.hideEmojiPicker();
-        };
+        },
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+        [],
+    );
 
-    const reportRecipient = personalDetails[participantsWithoutExpensifyAccountIDs[0]];
+    const reportRecipientAcountIDs = ReportUtils.getReportRecipientAccountIDs(report, currentUserPersonalDetails.accountID);
+    const reportRecipient = personalDetails[reportRecipientAcountIDs[0]];
     const shouldUseFocusedColor = !isBlockedFromConcierge && !disabled && isFocused;
 
     const hasReportRecipient = _.isObject(reportRecipient) && !_.isEmpty(reportRecipient);
@@ -356,7 +353,7 @@ function ReportActionCompose({
                                     reportID={reportID}
                                     report={report}
                                     reportParticipantIDs={reportParticipantIDs}
-                                    isFullComposerAvailable={isFullComposerAvailable}
+                                    isFullComposerAvailable={isFullComposerAvailable && !isCommentEmpty}
                                     isComposerFullSize={isComposerFullSize}
                                     updateShouldShowSuggestionMenuToFalse={updateShouldShowSuggestionMenuToFalse}
                                     isBlockedFromConcierge={isBlockedFromConcierge}
@@ -367,6 +364,7 @@ function ReportActionCompose({
                                     onCanceledAttachmentPicker={restoreKeyboardState}
                                     onMenuClosed={restoreKeyboardState}
                                     onAddActionPressed={onAddActionPressed}
+                                    onItemSelected={onItemSelected}
                                     actionButtonRef={actionButtonRef}
                                 />
                                 <ComposerWithSuggestions
@@ -418,6 +416,7 @@ function ReportActionCompose({
                     <SendButton
                         isDisabled={isSendDisabled}
                         setIsCommentEmpty={setIsCommentEmpty}
+                        resetFullComposerSize={resetFullComposerSize}
                         submitForm={submitForm}
                         animatedRef={animatedRef}
                     />
diff --git a/src/pages/home/report/ReportActionCompose/SendButton.js b/src/pages/home/report/ReportActionCompose/SendButton.js
index 4f1dc5fff191..8128b5a6b39d 100644
--- a/src/pages/home/report/ReportActionCompose/SendButton.js
+++ b/src/pages/home/report/ReportActionCompose/SendButton.js
@@ -23,11 +23,14 @@ const propTypes = {
     /** Sets the isCommentEmpty flag to true */
     setIsCommentEmpty: PropTypes.func.isRequired,
 
+    /** resets the composer to normal size */
+    resetFullComposerSize: PropTypes.func.isRequired,
+
     /** Submits the form */
     submitForm: PropTypes.func.isRequired,
 };
 
-function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty, submitForm}) {
+function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty, resetFullComposerSize, submitForm}) {
     const {translate} = useLocalize();
 
     const Tap = Gesture.Tap()
@@ -40,6 +43,7 @@ function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty,
             const updates = {text: ''};
             // We are setting the isCommentEmpty flag to true so the status of it will be in sync of the native text input state
             runOnJS(setIsCommentEmpty)(true);
+            runOnJS(resetFullComposerSize)();
             updatePropsPaperWorklet(viewTag, viewName, updates); // clears native text input on the UI thread
             runOnJS(submitForm)();
         });
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
index 687570af12e6..a760627e53cc 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
+++ b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
@@ -42,12 +42,6 @@ const propTypes = {
     /** Callback when a emoji was inserted */
     onInsertedEmoji: PropTypes.func.isRequired,
 
-    /** The current selection */
-    selection: PropTypes.shape({
-        start: PropTypes.number.isRequired,
-        end: PropTypes.number.isRequired,
-    }).isRequired,
-
     ...SuggestionProps.baseProps,
 };
 
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.js b/src/pages/home/report/ReportActionCompose/SuggestionMention.js
index 79b5d1d66e36..a76025b67b1e 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.js
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.js
@@ -1,4 +1,4 @@
-import React, {useState, useCallback, useRef, useImperativeHandle} from 'react';
+import React, {useState, useCallback, useRef, useImperativeHandle, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -45,6 +45,7 @@ const defaultProps = {
 function SuggestionMention({
     value,
     setValue,
+    selection,
     setSelection,
     isComposerFullSize,
     personalDetails,
@@ -231,12 +232,9 @@ function SuggestionMention({
         [getMentionOptions, personalDetails, resetSuggestions, setHighlightedMentionIndex, value],
     );
 
-    const onSelectionChange = useCallback(
-        (e) => {
-            calculateMentionSuggestion(e.nativeEvent.selection.end);
-        },
-        [calculateMentionSuggestion],
-    );
+    useEffect(() => {
+        calculateMentionSuggestion(selection.end);
+    }, [selection, calculateMentionSuggestion]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         setSuggestionValues((prevState) => {
@@ -262,12 +260,11 @@ function SuggestionMention({
         forwardedRef,
         () => ({
             resetSuggestions,
-            onSelectionChange,
             triggerHotkeyActions,
             setShouldBlockSuggestionCalc,
             updateShouldShowSuggestionMenuToFalse,
         }),
-        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse],
+        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse],
     );
 
     if (!isMentionSuggestionsMenuVisible) {
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.js b/src/pages/home/report/ReportActionCompose/Suggestions.js
index ed2ab9586d52..60cb9de4ccfb 100644
--- a/src/pages/home/report/ReportActionCompose/Suggestions.js
+++ b/src/pages/home/report/ReportActionCompose/Suggestions.js
@@ -66,8 +66,7 @@ function Suggestions({
 
     const onSelectionChange = useCallback((e) => {
         const emojiHandler = suggestionEmojiRef.current.onSelectionChange(e);
-        const mentionHandler = suggestionMentionRef.current.onSelectionChange(e);
-        return emojiHandler || mentionHandler;
+        return emojiHandler;
     }, []);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
@@ -102,6 +101,7 @@ function Suggestions({
         value,
         setValue,
         setSelection,
+        selection,
         isComposerFullSize,
         updateComment,
         composerHeight,
@@ -116,7 +116,6 @@ function Suggestions({
                 ref={suggestionEmojiRef}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...baseProps}
-                selection={selection}
                 onInsertedEmoji={onInsertedEmoji}
                 resetKeyboardInput={resetKeyboardInput}
             />
diff --git a/src/pages/home/report/ReportActionCompose/suggestionProps.js b/src/pages/home/report/ReportActionCompose/suggestionProps.js
index 24cf51b018c4..12447929b980 100644
--- a/src/pages/home/report/ReportActionCompose/suggestionProps.js
+++ b/src/pages/home/report/ReportActionCompose/suggestionProps.js
@@ -7,6 +7,12 @@ const baseProps = {
     /** Callback to update the current input value */
     setValue: PropTypes.func.isRequired,
 
+    /** The current selection value */
+    selection: PropTypes.shape({
+        start: PropTypes.number.isRequired,
+        end: PropTypes.number.isRequired,
+    }).isRequired,
+
     /** Callback to update the current selection */
     setSelection: PropTypes.func.isRequired,
 
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index d5d8b38bb92c..8cf8fd78371d 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -67,6 +67,8 @@ import * as BankAccounts from '../../../libs/actions/BankAccounts';
 import usePrevious from '../../../hooks/usePrevious';
 import ReportScreenContext from '../ReportScreenContext';
 import Permissions from '../../../libs/Permissions';
+import RenderHTML from '../../../components/RenderHTML';
+import ReportAttachmentsContext from './ReportAttachmentsContext';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -129,6 +131,7 @@ function ReportActionItem(props) {
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const {reactionListRef} = useContext(ReportScreenContext);
+    const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
     const textInputRef = useRef();
     const popoverAnchorRef = useRef();
     const downloadedPreviews = useRef([]);
@@ -136,6 +139,24 @@ function ReportActionItem(props) {
     const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action);
     const originalReport = props.report.reportID === originalReportID ? props.report : ReportUtils.getReport(originalReportID);
 
+    // When active action changes, we need to update the `isContextMenuActive` state
+    const isActiveReportActionForMenu = ReportActionContextMenu.isActiveReportAction(props.action.reportActionID);
+    useEffect(() => {
+        setIsContextMenuActive(isActiveReportActionForMenu);
+    }, [isActiveReportActionForMenu]);
+
+    const updateHiddenState = useCallback(
+        (isHiddenValue) => {
+            setIsHidden(isHiddenValue);
+            const isAttachment = ReportUtils.isReportMessageAttachment(_.last(props.action.message));
+            if (!isAttachment) {
+                return;
+            }
+            updateHiddenAttachments(props.action.reportActionID, isHiddenValue);
+        },
+        [props.action.reportActionID, props.action.message, updateHiddenAttachments],
+    );
+
     useEffect(
         () => () => {
             // ReportActionContextMenu, EmojiPicker and PopoverReactionList are global components,
@@ -223,7 +244,8 @@ function ReportActionItem(props) {
                 selection,
                 popoverAnchorRef,
                 props.report.reportID,
-                props.action,
+                props.action.reportActionID,
+                originalReportID,
                 props.draftMessage,
                 () => {},
                 toggleContextMenuFromActiveReportAction,
@@ -231,7 +253,7 @@ function ReportActionItem(props) {
                 ReportUtils.chatIncludesChronos(originalReport),
             );
         },
-        [props.draftMessage, props.action, props.report.reportID, toggleContextMenuFromActiveReportAction, originalReport],
+        [props.draftMessage, props.action, props.report.reportID, toggleContextMenuFromActiveReportAction, originalReport, originalReportID],
     );
 
     const toggleReaction = useCallback(
@@ -244,10 +266,11 @@ function ReportActionItem(props) {
     /**
      * Get the content of ReportActionItem
      * @param {Boolean} hovered whether the ReportActionItem is hovered
+     * @param {Boolean} isWhisper whether the report action is a whisper
      * @param {Boolean} hasErrors whether the report action has any errors
      * @returns {Object} child component(s)
      */
-    const renderItemContent = (hovered = false, hasErrors = false) => {
+    const renderItemContent = (hovered = false, isWhisper = false, hasErrors = false) => {
         let children;
         const originalMessage = lodashGet(props.action, 'originalMessage', {});
 
@@ -273,6 +296,7 @@ function ReportActionItem(props) {
                     contextMenuAnchor={popoverAnchorRef}
                     checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
                     style={props.displayAsGroup ? [] : [styles.mt2]}
+                    isWhisper={isWhisper}
                 />
             );
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW) {
@@ -286,6 +310,7 @@ function ReportActionItem(props) {
                     isHovered={hovered}
                     contextMenuAnchor={popoverAnchorRef}
                     checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
+                    isWhisper={isWhisper}
                 />
             );
         } else if (
@@ -341,6 +366,7 @@ function ReportActionItem(props) {
                     {!props.draftMessage ? (
                         <View style={props.displayAsGroup && hasBeenFlagged ? styles.blockquote : {}}>
                             <ReportActionItemMessage
+                                reportID={props.report.reportID}
                                 action={props.action}
                                 displayAsGroup={props.displayAsGroup}
                                 isHidden={isHidden}
@@ -357,7 +383,7 @@ function ReportActionItem(props) {
                                 <Button
                                     small
                                     style={[styles.mt2, styles.alignSelfStart]}
-                                    onPress={() => setIsHidden(!isHidden)}
+                                    onPress={() => updateHiddenState(!isHidden)}
                                 >
                                     <Text
                                         style={styles.buttonSmallText}
@@ -447,7 +473,7 @@ function ReportActionItem(props) {
      * @returns {Object} report action item
      */
     const renderReportActionItem = (hovered, isWhisper, hasErrors) => {
-        const content = renderItemContent(hovered || isContextMenuActive, hasErrors);
+        const content = renderItemContent(hovered || isContextMenuActive, isWhisper, hasErrors);
 
         if (props.draftMessage) {
             return <ReportActionItemDraft>{content}</ReportActionItemDraft>;
@@ -495,6 +521,22 @@ function ReportActionItem(props) {
             );
         }
         if (ReportUtils.isTaskReport(props.report)) {
+            if (ReportUtils.isCanceledTaskReport(props.report, parentReportAction)) {
+                return (
+                    <>
+                        <ReportActionItemSingle
+                            action={parentReportAction}
+                            showHeader={!props.draftMessage}
+                            wrapperStyles={[styles.chatItem]}
+                            report={props.report}
+                        >
+                            <RenderHTML html={`<comment>${props.translate('parentReportAction.deletedTask')}</comment>`} />
+                        </ReportActionItemSingle>
+                        <View style={styles.reportHorizontalRule} />
+                    </>
+                );
+            }
+
             return (
                 <OfflineWithFeedback pendingAction={props.action.pendingAction}>
                     <TaskView
@@ -551,14 +593,18 @@ function ReportActionItem(props) {
             withoutFocusOnSecondaryInteraction
             accessibilityLabel={props.translate('accessibilityHints.chatMessage')}
         >
-            <Hoverable disabled={Boolean(props.draftMessage)}>
+            <Hoverable
+                shouldHandleScroll
+                disabled={Boolean(props.draftMessage)}
+            >
                 {(hovered) => (
                     <View>
                         {props.shouldDisplayNewMarker && <UnreadActionIndicator reportActionID={props.action.reportActionID} />}
                         <MiniReportActionContextMenu
                             reportID={props.report.reportID}
-                            reportAction={props.action}
-                            isArchivedRoom={ReportUtils.isArchivedRoom(originalReport)}
+                            reportActionID={props.action.reportActionID}
+                            originalReportID={originalReportID}
+                            isArchivedRoom={ReportUtils.isArchivedRoom(props.report)}
                             displayAsGroup={props.displayAsGroup}
                             isVisible={hovered && !props.draftMessage && !hasErrors}
                             draftMessage={props.draftMessage}
@@ -573,13 +619,14 @@ function ReportActionItem(props) {
                             <OfflineWithFeedback
                                 onClose={() => ReportActions.clearReportActionErrors(props.report.reportID, props.action)}
                                 pendingAction={props.draftMessage ? null : props.action.pendingAction}
-                                shouldHideOnDelete={!ReportActionsUtils.hasCommentThread(props.action)}
+                                shouldHideOnDelete={!ReportActionsUtils.isThreadParentMessage(props.action, props.report.reportID)}
                                 errors={props.action.errors}
                                 errorRowStyles={[styles.ml10, styles.mr2]}
                                 needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(props.action)}
+                                shouldDisableStrikeThrough
                             >
                                 {isWhisper && (
-                                    <View style={[styles.flexRow, styles.pl5, styles.pt2]}>
+                                    <View style={[styles.flexRow, styles.pl5, styles.pt2, styles.pr3]}>
                                         <View style={[styles.pl6, styles.mr3]}>
                                             <Icon
                                                 src={Expensicons.Eye}
@@ -595,7 +642,7 @@ function ReportActionItem(props) {
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled
                                             numberOfLines={1}
-                                            textStyles={[styles.chatItemMessageHeaderTimestamp]}
+                                            textStyles={[styles.chatItemMessageHeaderTimestamp, styles.flex1]}
                                             shouldUseFullTitle={isWhisperOnlyVisibleByUser}
                                         />
                                     </View>
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index 91ee8f7531da..1f61b44841bc 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -16,7 +16,6 @@ import compose from '../../../libs/compose';
 import convertToLTR from '../../../libs/convertToLTR';
 import {withNetwork} from '../../../components/OnyxProvider';
 import CONST from '../../../CONST';
-import applyStrikethrough from '../../../components/HTMLEngineProvider/applyStrikethrough';
 import editedLabelStyles from '../../../styles/editedLabelStyles';
 import UserDetailsTooltip from '../../../components/UserDetailsTooltip';
 import avatarPropTypes from '../../../components/avatarPropTypes';
@@ -67,6 +66,9 @@ const propTypes = {
     /** icon */
     actorIcon: avatarPropTypes,
 
+    /** Whether the comment is a thread parent message/the first message in a thread */
+    isThreadParentMessage: PropTypes.bool,
+
     ...windowDimensionsPropTypes,
 
     /** localization props */
@@ -88,6 +90,7 @@ const defaultProps = {
     style: [],
     delegateAccountID: 0,
     actorIcon: {},
+    isThreadParentMessage: false,
 };
 
 function ReportActionItemFragment(props) {
@@ -108,12 +111,13 @@ function ReportActionItemFragment(props) {
                 );
             }
             const {html, text} = props.fragment;
+            const isPendingDelete = props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && props.network.isOffline;
 
             // Threaded messages display "[Deleted message]" instead of being hidden altogether.
             // While offline we display the previous message with a strikethrough style. Once online we want to
             // immediately display "[Deleted message]" while the delete action is pending.
 
-            if ((!props.network.isOffline && props.hasCommentThread && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) || props.fragment.isDeletedParentAction) {
+            if ((!props.network.isOffline && props.isThreadParentMessage && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) || props.fragment.isDeletedParentAction) {
                 return <RenderHTML html={`<comment>${props.translate('parentReportAction.deletedMessage')}</comment>`} />;
             }
 
@@ -124,34 +128,40 @@ function ReportActionItemFragment(props) {
 
             // Only render HTML if we have html in the fragment
             if (!differByLineBreaksOnly) {
-                const isPendingDelete = props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && props.network.isOffline;
                 const editedTag = props.fragment.isEdited ? `<edited ${isPendingDelete ? 'deleted' : ''}></edited>` : '';
-                const htmlContent = applyStrikethrough(html + editedTag, isPendingDelete);
+                const htmlContent = isPendingDelete ? `<del>${html}</del>` : html;
+
+                const htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;
 
-                return <RenderHTML html={props.source === 'email' ? `<email-comment>${htmlContent}</email-comment>` : `<comment>${htmlContent}</comment>`} />;
+                return <RenderHTML html={props.source === 'email' ? `<email-comment>${htmlWithTag}</email-comment>` : `<comment>${htmlWithTag}</comment>`} />;
             }
             const containsOnlyEmojis = EmojiUtils.containsOnlyEmojis(text);
 
             return (
-                <Text
-                    selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
-                    style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}
-                >
-                    {convertToLTR(props.iouMessage || text)}
+                <Text style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}>
+                    <Text
+                        selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
+                        style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style, isPendingDelete ? styles.offlineFeedback.deleted : undefined]}
+                    >
+                        {convertToLTR(props.iouMessage || text)}
+                    </Text>
                     {Boolean(props.fragment.isEdited) && (
-                        <Text
-                            fontSize={variables.fontSizeSmall}
-                            color={themeColors.textSupporting}
-                            style={[editedLabelStyles, ...props.style]}
-                        >
+                        <>
                             <Text
                                 selectable={false}
-                                style={[containsOnlyEmojis ? styles.onlyEmojisTextLineHeight : undefined, styles.w1, styles.userSelectNone]}
+                                style={[containsOnlyEmojis ? styles.onlyEmojisTextLineHeight : undefined, styles.userSelectNone]}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {' '}
                             </Text>
-                            {props.translate('reportActionCompose.edited')}
-                        </Text>
+                            <Text
+                                fontSize={variables.fontSizeSmall}
+                                color={themeColors.textSupporting}
+                                style={[editedLabelStyles, isPendingDelete ? styles.offlineFeedback.deleted : undefined, ...props.style]}
+                            >
+                                {props.translate('reportActionCompose.edited')}
+                            </Text>
+                        </>
                     )}
                 </Text>
             );
diff --git a/src/pages/home/report/ReportActionItemMessage.js b/src/pages/home/report/ReportActionItemMessage.js
index 40d2d5e6d89c..bc92889158d0 100644
--- a/src/pages/home/report/ReportActionItemMessage.js
+++ b/src/pages/home/report/ReportActionItemMessage.js
@@ -23,6 +23,9 @@ const propTypes = {
     /** Whether or not the message is hidden by moderation */
     isHidden: PropTypes.bool,
 
+    /** The ID of the report */
+    reportID: PropTypes.string.isRequired,
+
     /** localization props */
     ...withLocalizePropTypes,
 };
@@ -53,7 +56,7 @@ function ReportActionItemMessage(props) {
                         fragment={fragment}
                         isAttachment={props.action.isAttachment}
                         iouMessage={iouMessage}
-                        hasCommentThread={ReportActionsUtils.hasCommentThread(props.action)}
+                        isThreadParentMessage={ReportActionsUtils.isThreadParentMessage(props.action, props.reportID)}
                         attachmentInfo={props.action.attachmentInfo}
                         pendingAction={props.action.pendingAction}
                         source={lodashGet(props.action, 'originalMessage.source')}
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index e2c50b288fe5..43ff5c00a4d5 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -14,7 +14,7 @@ import containerComposeStyles from '../../../styles/containerComposeStyles';
 import Composer from '../../../components/Composer';
 import * as Report from '../../../libs/actions/Report';
 import {withReportActionsDrafts} from '../../../components/OnyxProvider';
-import openReportActionComposeViewWhenClosingMessageEdit from '../../../libs/openReportActionComposeViewWhenClosingMessageEdit';
+import setShouldShowComposeInputKeyboardAware from '../../../libs/setShouldShowComposeInputKeyboardAware';
 import ReportActionComposeFocusManager from '../../../libs/ReportActionComposeFocusManager';
 import EmojiPickerButton from '../../../components/EmojiPicker/EmojiPickerButton';
 import Icon from '../../../components/Icon';
@@ -28,7 +28,6 @@ import ExceededCommentLength from '../../../components/ExceededCommentLength';
 import CONST from '../../../CONST';
 import refPropTypes from '../../../components/refPropTypes';
 import * as ComposerUtils from '../../../libs/ComposerUtils';
-import * as ComposerActions from '../../../libs/actions/Composer';
 import * as User from '../../../libs/actions/User';
 import PressableWithFeedback from '../../../components/Pressable/PressableWithFeedback';
 import getButtonState from '../../../libs/getButtonState';
@@ -40,6 +39,7 @@ import useReportScrollManager from '../../../hooks/useReportScrollManager';
 import * as EmojiPickerAction from '../../../libs/actions/EmojiPickerAction';
 import focusWithDelay from '../../../libs/focusWithDelay';
 import ONYXKEYS from '../../../ONYXKEYS';
+import * as Browser from '../../../libs/Browser';
 
 const propTypes = {
     /** All the data of the action */
@@ -83,18 +83,18 @@ const defaultProps = {
 };
 
 // native ids
-const saveButtonID = 'saveButton';
-const cancelButtonID = 'cancelButton';
 const emojiButtonID = 'emojiButton';
 const messageEditInput = 'messageEditInput';
 
+const isMobileSafari = Browser.isMobileSafari();
+
 function ReportActionItemMessageEdit(props) {
     const reportScrollManager = useReportScrollManager();
     const {translate} = useLocalize();
     const {isKeyboardShown} = useKeyboardState();
     const {isSmallScreenWidth} = useWindowDimensions();
 
-    const [draft, setDraft] = useState(() => {
+    const getInitialDraft = () => {
         if (props.draftMessage === props.action.message[0].html) {
             // We only convert the report action message to markdown if the draft message is unchanged.
             const parser = new ExpensiMark();
@@ -102,8 +102,19 @@ function ReportActionItemMessageEdit(props) {
         }
         // We need to decode saved draft message because it's escaped before saving.
         return Str.htmlDecode(props.draftMessage);
-    });
-    const [selection, setSelection] = useState({start: 0, end: 0});
+    };
+
+    const getInitialSelection = () => {
+        if (isMobileSafari) {
+            return {start: 0, end: 0};
+        }
+
+        const length = getInitialDraft().length;
+        return {start: length, end: length};
+    };
+
+    const [draft, setDraft] = useState(() => getInitialDraft());
+    const [selection, setSelection] = useState(getInitialSelection());
     const [isFocused, setIsFocused] = useState(false);
     const [hasExceededMaxCommentLength, setHasExceededMaxCommentLength] = useState(false);
 
@@ -116,29 +127,44 @@ function ReportActionItemMessageEdit(props) {
         isFocusedRef.current = isFocused;
     }, [isFocused]);
 
+    // We consider the report action active if it's focused, its emoji picker is open or its context menu is open
+    const isActive = useCallback(
+        () => isFocusedRef.current || EmojiPickerAction.isActive(props.action.reportActionID) || ReportActionContextMenu.isActiveReportAction(props.action.reportActionID),
+        [props.action.reportActionID],
+    );
+
     useEffect(() => {
         // For mobile Safari, updating the selection prop on an unfocused input will cause it to automatically gain focus
         // and subsequent programmatic focus shifts (e.g., modal focus trap) to show the blue frame (:focus-visible style),
         // so we need to ensure that it is only updated after focus.
-        setDraft((prevDraft) => {
-            setSelection({
-                start: prevDraft.length,
-                end: prevDraft.length,
+        if (isMobileSafari) {
+            setDraft((prevDraft) => {
+                setSelection({
+                    start: prevDraft.length,
+                    end: prevDraft.length,
+                });
+                return prevDraft;
             });
-            return prevDraft;
-        });
+        }
 
         return () => {
-            // Skip if this is not the focused message so the other edit composer stays focused.
-            // In small screen devices, when EmojiPicker is shown, the current edit message will lose focus, we need to check this case as well.
-            if (!isFocusedRef.current && !EmojiPickerAction.isActive(props.action.reportActionID)) {
+            // Skip if the current report action is not active
+            if (!isActive()) {
                 return;
             }
 
+            if (EmojiPickerAction.isActive(props.action.reportActionID)) {
+                EmojiPickerAction.clearActive();
+            }
+            if (ReportActionContextMenu.isActiveReportAction(props.action.reportActionID)) {
+                ReportActionContextMenu.clearActiveReportAction();
+            }
+
             // Show the main composer when the focused message is deleted from another client
             // to prevent the main composer stays hidden until we swtich to another chat.
-            ComposerActions.setShouldShowComposeInput(true);
+            setShouldShowComposeInputKeyboardAware(true);
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- this cleanup needs to be called only on unmount
     }, [props.action.reportActionID]);
 
     /**
@@ -211,9 +237,11 @@ function ReportActionItemMessageEdit(props) {
     const deleteDraft = useCallback(() => {
         debouncedSaveDraft.cancel();
         Report.saveReportActionDraft(props.reportID, props.action.reportActionID, '');
-        ComposerActions.setShouldShowComposeInput(true);
-        ReportActionComposeFocusManager.clear();
-        ReportActionComposeFocusManager.focus();
+
+        if (isActive()) {
+            ReportActionComposeFocusManager.clear();
+            ReportActionComposeFocusManager.focus();
+        }
 
         // Scroll to the last comment after editing to make sure the whole comment is clearly visible in the report.
         if (props.index === 0) {
@@ -222,7 +250,7 @@ function ReportActionItemMessageEdit(props) {
                 keyboardDidHideListener.remove();
             });
         }
-    }, [props.action.reportActionID, debouncedSaveDraft, props.index, props.reportID, reportScrollManager]);
+    }, [props.action.reportActionID, debouncedSaveDraft, props.index, props.reportID, reportScrollManager, isActive]);
 
     /**
      * Save the draft of the comment to be the new comment message. This will take the comment out of "edit mode" with
@@ -257,6 +285,7 @@ function ReportActionItemMessageEdit(props) {
 
         // When user tries to save the empty message, it will delete it. Prompt the user to confirm deleting.
         if (!trimmedNewDraft) {
+            textInputRef.current.blur();
             ReportActionContextMenu.showDeleteModal(props.reportID, props.action, false, deleteDraft, () => InteractionManager.runAfterInteractions(() => textInputRef.current.focus()));
             return;
         }
@@ -309,7 +338,6 @@ function ReportActionItemMessageEdit(props) {
                         <PressableWithFeedback
                             onPress={deleteDraft}
                             style={styles.chatItemSubmitButton}
-                            nativeID={cancelButtonID}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                             accessibilityLabel={translate('common.close')}
                             // disable dimming
@@ -317,6 +345,8 @@ function ReportActionItemMessageEdit(props) {
                             pressDimmingValue={1}
                             hoverStyle={StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.ACTIVE)}
                             pressStyle={StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.PRESSED)}
+                            // Keep focus on the composer when cancel button is clicked.
+                            onMouseDown={(e) => e.preventDefault()}
                         >
                             {({hovered, pressed}) => (
                                 <Icon
@@ -353,21 +383,23 @@ function ReportActionItemMessageEdit(props) {
                             onFocus={() => {
                                 setIsFocused(true);
                                 reportScrollManager.scrollToIndex({animated: true, index: props.index}, true);
-                                ComposerActions.setShouldShowComposeInput(false);
+                                setShouldShowComposeInputKeyboardAware(false);
+
+                                // Clear active report action when another action gets focused
+                                if (!EmojiPickerAction.isActive(props.action.reportActionID)) {
+                                    EmojiPickerAction.clearActive();
+                                }
+                                if (!ReportActionContextMenu.isActiveReportAction(props.action.reportActionID)) {
+                                    ReportActionContextMenu.clearActiveReportAction();
+                                }
                             }}
                             onBlur={(event) => {
                                 setIsFocused(false);
                                 const relatedTargetId = lodashGet(event, 'nativeEvent.relatedTarget.id');
-
-                                // Return to prevent re-render when save/cancel button is pressed which cancels the onPress event by re-rendering
-                                if (_.contains([saveButtonID, cancelButtonID, emojiButtonID], relatedTargetId)) {
-                                    return;
-                                }
-
-                                if (messageEditInput === relatedTargetId) {
+                                if (_.contains([messageEditInput, emojiButtonID], relatedTargetId)) {
                                     return;
                                 }
-                                openReportActionComposeViewWhenClosingMessageEdit();
+                                setShouldShowComposeInputKeyboardAware(true);
                             }}
                             selection={selection}
                             onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
@@ -391,12 +423,13 @@ function ReportActionItemMessageEdit(props) {
                             <PressableWithFeedback
                                 style={[styles.chatItemSubmitButton, hasExceededMaxCommentLength ? {} : styles.buttonSuccess]}
                                 onPress={publishDraft}
-                                nativeID={saveButtonID}
                                 disabled={hasExceededMaxCommentLength}
                                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                                 accessibilityLabel={translate('common.saveChanges')}
                                 hoverDimmingValue={1}
                                 pressDimmingValue={0.2}
+                                // Keep focus on the composer when send button is clicked.
+                                onMouseDown={(e) => e.preventDefault()}
                             >
                                 <Icon
                                     src={Expensicons.Checkmark}
diff --git a/src/pages/home/report/ReportActionItemParentAction.js b/src/pages/home/report/ReportActionItemParentAction.js
index 2af66779309e..8e1fb6aafdd4 100644
--- a/src/pages/home/report/ReportActionItemParentAction.js
+++ b/src/pages/home/report/ReportActionItemParentAction.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {View} from 'react-native';
+import {View, Image} from 'react-native';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
@@ -15,6 +15,7 @@ import withLocalize from '../../../components/withLocalize';
 import ReportActionItem from './ReportActionItem';
 import reportActionPropTypes from './reportActionPropTypes';
 import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
+import EmptyStateBackgroundImage from '../../../../assets/images/empty-state_background-fade.png';
 
 const propTypes = {
     /** Flag to show, hide the thread divider line */
@@ -53,12 +54,18 @@ function ReportActionItemParentAction(props) {
     }
     return (
         <OfflineWithFeedback
+            shouldDisableOpacity={Boolean(lodashGet(parentReportAction, 'pendingAction'))}
             pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom') || lodashGet(props.report, 'pendingFields.createChat')}
             errors={lodashGet(props.report, 'errorFields.addWorkspaceRoom') || lodashGet(props.report, 'errorFields.createChat')}
             errorRowStyles={[styles.ml10, styles.mr2]}
             onClose={() => Report.navigateToConciergeChatAndDeleteReport(props.report.reportID)}
         >
             <View style={StyleUtils.getReportWelcomeContainerStyle(props.isSmallScreenWidth)}>
+                <Image
+                    pointerEvents="none"
+                    source={EmptyStateBackgroundImage}
+                    style={StyleUtils.getReportWelcomeBackgroundImageStyle(props.isSmallScreenWidth)}
+                />
                 <View style={[styles.p5, StyleUtils.getReportWelcomeTopMarginStyle(props.isSmallScreenWidth)]} />
                 {parentReportAction && (
                     <ReportActionItem
diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index 80f49f177b6f..bfbce8aed336 100644
--- a/src/pages/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -92,7 +92,8 @@ function ReportActionItemSingle(props) {
     let {displayName} = props.personalDetailsList[actorAccountID] || {};
     const {avatar, login, pendingFields, status} = props.personalDetailsList[actorAccountID] || {};
     let actorHint = (login || displayName || '').replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
-    const isWorkspaceActor = ReportUtils.isPolicyExpenseChat(props.report) && !actorAccountID;
+    const displayAllActors = useMemo(() => props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && props.iouReport, [props.action.actionName, props.iouReport]);
+    const isWorkspaceActor = ReportUtils.isPolicyExpenseChat(props.report) && (!actorAccountID || displayAllActors);
     let avatarSource = UserUtils.getAvatar(avatar, actorAccountID);
 
     if (isWorkspaceActor) {
@@ -111,7 +112,6 @@ function ReportActionItemSingle(props) {
 
     // If this is a report preview, display names and avatars of both people involved
     let secondaryAvatar = {};
-    const displayAllActors = useMemo(() => props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && props.iouReport, [props.action.actionName, props.iouReport]);
     const primaryDisplayName = displayName;
     if (displayAllActors) {
         const secondaryUserDetails = props.personalDetailsList[props.iouReport.ownerAccountID] || {};
@@ -126,7 +126,7 @@ function ReportActionItemSingle(props) {
     } else if (!isWorkspaceActor) {
         secondaryAvatar = ReportUtils.getIcons(props.report, {})[props.report.isOwnPolicyExpenseChat ? 0 : 1];
     }
-    const icon = {source: avatarSource, type: isWorkspaceActor ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR, name: primaryDisplayName, id: actorAccountID};
+    const icon = {source: avatarSource, type: isWorkspaceActor ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR, name: primaryDisplayName, id: isWorkspaceActor ? '' : actorAccountID};
 
     // Since the display name for a report action message is delivered with the report history as an array of fragments
     // we'll need to take the displayName from personal details and have it be in the same format for now. Eventually,
@@ -140,18 +140,21 @@ function ReportActionItemSingle(props) {
           ]
         : props.action.person;
 
+    const reportID = props.report && props.report.reportID;
+    const iouReportID = props.iouReport && props.iouReport.reportID;
+
     const showActorDetails = useCallback(() => {
         if (isWorkspaceActor) {
-            showWorkspaceDetails(props.report.reportID);
+            showWorkspaceDetails(reportID);
         } else {
             // Show participants page IOU report preview
             if (displayAllActors) {
-                Navigation.navigate(ROUTES.getReportParticipantsRoute(props.iouReport.reportID));
+                Navigation.navigate(ROUTES.getReportParticipantsRoute(iouReportID));
                 return;
             }
             showUserDetails(props.action.delegateAccountID ? props.action.delegateAccountID : actorAccountID);
         }
-    }, [isWorkspaceActor, props.report.reportID, actorAccountID, props.action.delegateAccountID, props.iouReport, displayAllActors]);
+    }, [isWorkspaceActor, reportID, actorAccountID, props.action.delegateAccountID, iouReportID, displayAllActors]);
 
     const shouldDisableDetailPage = useMemo(
         () => !isWorkspaceActor && ReportUtils.isOptimisticPersonalDetail(props.action.delegateAccountID ? props.action.delegateAccountID : actorAccountID),
diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js
index ebd965e80daf..9c688911759e 100644
--- a/src/pages/home/report/ReportActionItemThread.js
+++ b/src/pages/home/report/ReportActionItemThread.js
@@ -62,6 +62,7 @@ function ReportActionItemThread(props) {
                         <Text
                             selectable={false}
                             style={[styles.link, styles.ml2, styles.h4, styles.noWrap]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {`${numberOfRepliesText} ${replyText}`}
                         </Text>
@@ -69,6 +70,7 @@ function ReportActionItemThread(props) {
                             selectable={false}
                             numberOfLines={1}
                             style={[styles.ml2, styles.textMicroSupporting, styles.flex1]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {timeStamp}
                         </Text>
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 7f897ee825fb..5ba91cccf924 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -74,6 +74,12 @@ const MSG_VISIBLE_THRESHOLD = 250;
 // the useRef value gets reset when the reportID changes, so we use a global variable to keep track
 let prevReportID = null;
 
+// In the component we are subscribing to the arrival of new actions.
+// As there is the possibility that there are multiple instances of a ReportScreen
+// for the same report, we only ever want one subscription to be active, as
+// the subscriptions could otherwise be conflicting.
+const newActionUnsubscribeMap = {};
+
 /**
  * Create a unique key for each action in the FlatList.
  * We use the reportActionID that is a string representation of a random 64-bit int, which should be
@@ -176,6 +182,44 @@ function ReportActionsList({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [report.lastReadTime]);
 
+    useEffect(() => {
+        // Why are we doing this, when in the cleanup of the useEffect we are already calling the unsubscribe function?
+        // Answer: On web, when navigating to another report screen, the previous report screen doesn't get unmounted,
+        //         meaning that the cleanup might not get called. When we then open a report we had open already previosuly, a new
+        //         ReportScreen will get created. Thus, we have to cancel the earlier subscription of the previous screen,
+        //         because the two subscriptions could conflict!
+        //         In case we return to the previous screen (e.g. by web back navigation) the useEffect for that screen would
+        //         fire again, as the focus has changed and will set up the subscription correctly again.
+        const previousSubUnsubscribe = newActionUnsubscribeMap[report.reportID];
+        if (previousSubUnsubscribe) {
+            previousSubUnsubscribe();
+        }
+
+        // This callback is triggered when a new action arrives via Pusher and the event is emitted from Report.js. This allows us to maintain
+        // a single source of truth for the "new action" event instead of trying to derive that a new action has appeared from looking at props.
+        const unsubscribe = Report.subscribeToNewActionEvent(report.reportID, (isFromCurrentUser) => {
+            // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
+            // they are now in the list.
+            if (!isFromCurrentUser) {
+                return;
+            }
+            reportScrollManager.scrollToBottom();
+        });
+
+        const cleanup = () => {
+            if (unsubscribe) {
+                unsubscribe();
+            }
+            Report.unsubscribeFromReportChannel(report.reportID);
+        };
+
+        newActionUnsubscribeMap[report.reportID] = cleanup;
+
+        return cleanup;
+
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [report.reportID]);
+
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.
      */
@@ -291,6 +335,7 @@ function ReportActionsList({
                 <InvertedFlatList
                     accessibilityLabel={translate('sidebarScreen.listOfChatMessages')}
                     ref={reportScrollManager.ref}
+                    style={styles.overscrollBehaviorContain}
                     data={sortedReportActions}
                     renderItem={renderItem}
                     contentContainerStyle={styles.chatContentScrollView}
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index da475e61f749..fb0f10298537 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -132,6 +132,13 @@ function ReportActionsView(props) {
         }
     }, [props.report, didSubscribeToReportTypingEvents, reportID]);
 
+    useEffect(() => {
+        if (isFocused || !context.reactionListRef || !context.reactionListRef.current) {
+            return;
+        }
+        context.reactionListRef.current.hideReactionList();
+    }, [isFocused, context.reactionListRef]);
+
     /**
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.
@@ -275,6 +282,10 @@ function arePropsEqual(oldProps, newProps) {
         return false;
     }
 
+    if (lodashGet(newProps, 'report.participantAccountIDs', 0) !== lodashGet(oldProps, 'report.participantAccountIDs', 0)) {
+        return false;
+    }
+
     return _.isEqual(lodashGet(newProps.report, 'icons', []), lodashGet(oldProps.report, 'icons', []));
 }
 
diff --git a/src/pages/home/report/ReportAttachmentsContext.js b/src/pages/home/report/ReportAttachmentsContext.js
new file mode 100644
index 000000000000..a51df01313e5
--- /dev/null
+++ b/src/pages/home/report/ReportAttachmentsContext.js
@@ -0,0 +1,42 @@
+import React, {useEffect, useMemo, useRef} from 'react';
+import PropTypes from 'prop-types';
+import useCurrentReportID from '../../../hooks/useCurrentReportID';
+
+const ReportAttachmentsContext = React.createContext();
+
+const propTypes = {
+    /** Rendered child component */
+    children: PropTypes.node.isRequired,
+};
+
+function ReportAttachmentsProvider(props) {
+    const currentReportID = useCurrentReportID();
+    const hiddenAttachments = useRef({});
+
+    useEffect(() => {
+        // We only want to store the attachment visibility for the current report.
+        // If the current report ID changes, clear the ref.
+        hiddenAttachments.current = {};
+    }, [currentReportID]);
+
+    const contextValue = useMemo(
+        () => ({
+            isAttachmentHidden: (reportActionID) => hiddenAttachments.current[reportActionID],
+            updateHiddenAttachments: (reportActionID, value) => {
+                hiddenAttachments.current = {
+                    ...hiddenAttachments.current,
+                    [reportActionID]: value,
+                };
+            },
+        }),
+        [],
+    );
+
+    return <ReportAttachmentsContext.Provider value={contextValue}>{props.children}</ReportAttachmentsContext.Provider>;
+}
+
+ReportAttachmentsProvider.propTypes = propTypes;
+ReportAttachmentsProvider.displayName = 'ReportAttachmentsProvider';
+
+export default ReportAttachmentsContext;
+export {ReportAttachmentsProvider};
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 0057e16aed7c..c38ac9e01ccb 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -3,7 +3,6 @@ import React from 'react';
 import {View} from 'react-native';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
 import styles from '../../../styles/styles';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import ONYXKEYS from '../../../ONYXKEYS';
@@ -30,7 +29,6 @@ import * as Session from '../../../libs/actions/Session';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
 import onyxSubscribe from '../../../libs/onyxSubscribe';
 import * as ReportActionContextMenu from '../report/ContextMenu/ReportActionContextMenu';
-import withCurrentReportID from '../../../components/withCurrentReportID';
 import SignInOrAvatarWithOptionalStatus from './SignInOrAvatarWithOptionalStatus';
 
 const basePropTypes = {
@@ -53,22 +51,13 @@ const propTypes = {
 
     priorityMode: PropTypes.oneOf(_.values(CONST.PRIORITY_MODE)),
 
-    /** The top most report id */
-    currentReportID: PropTypes.string,
-
-    /* Onyx Props */
-    report: PropTypes.shape({
-        /** reportID (only present when there is a matching report) */
-        reportID: PropTypes.string,
-    }),
+    isActiveReport: PropTypes.func.isRequired,
 
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     priorityMode: CONST.PRIORITY_MODE.DEFAULT,
-    currentReportID: '',
-    report: {},
 };
 
 class SidebarLinks extends React.PureComponent {
@@ -142,10 +131,14 @@ class SidebarLinks extends React.PureComponent {
      */
     showReportPage(option) {
         // Prevent opening Report page when clicking LHN row quickly after clicking FAB icon
-        // or when clicking the active LHN row
+        // or when clicking the active LHN row on large screens
         // or when continuously clicking different LHNs, only apply to small screen
         // since getTopmostReportId always returns on other devices
-        if (this.props.isCreateMenuOpen || this.props.currentReportID === option.reportID || (this.props.isSmallScreenWidth && Navigation.getTopmostReportId())) {
+        if (
+            this.props.isCreateMenuOpen ||
+            (!this.props.isSmallScreenWidth && this.props.isActiveReport(option.reportID)) ||
+            (this.props.isSmallScreenWidth && Navigation.getTopmostReportId())
+        ) {
             return;
         }
         Navigation.navigate(ROUTES.getReportRoute(option.reportID));
@@ -164,7 +157,7 @@ class SidebarLinks extends React.PureComponent {
                     <Header
                         title={
                             <LogoComponent
-                                fill={defaultTheme.textLight}
+                                fill={defaultTheme.text}
                                 width={variables.lhnLogoWidth}
                                 height={variables.lhnLogoHeight}
                             />
@@ -201,14 +194,5 @@ class SidebarLinks extends React.PureComponent {
 
 SidebarLinks.propTypes = propTypes;
 SidebarLinks.defaultProps = defaultProps;
-export default compose(
-    withLocalize,
-    withWindowDimensions,
-    withCurrentReportID,
-    withOnyx({
-        report: {
-            key: ({currentReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${currentReportID}`,
-        },
-    }),
-)(SidebarLinks);
+export default compose(withLocalize, withWindowDimensions)(SidebarLinks);
 export {basePropTypes};
diff --git a/src/pages/home/sidebar/SidebarLinksData.js b/src/pages/home/sidebar/SidebarLinksData.js
index 3eca506f7591..243ba24cdd00 100644
--- a/src/pages/home/sidebar/SidebarLinksData.js
+++ b/src/pages/home/sidebar/SidebarLinksData.js
@@ -1,4 +1,4 @@
-import React, {useMemo, useRef} from 'react';
+import React, {useCallback, useMemo, useRef} from 'react';
 import _ from 'underscore';
 import {deepEqual} from 'fast-equals';
 import {withOnyx} from 'react-native-onyx';
@@ -69,17 +69,33 @@ function SidebarLinksData({isFocused, allReportActions, betas, chatReports, curr
     const reportIDsRef = useRef(null);
     const isLoading = SessionUtils.didUserLogInDuringSession() && isLoadingReportData;
     const optionListItems = useMemo(() => {
-        const reportIDs = SidebarUtils.getOrderedReportIDs(currentReportID, chatReports, betas, policies, priorityMode, allReportActions);
+        const reportIDs = SidebarUtils.getOrderedReportIDs(null, chatReports, betas, policies, priorityMode, allReportActions);
         if (deepEqual(reportIDsRef.current, reportIDs)) {
             return reportIDsRef.current;
         }
 
         // We need to update existing reports only once while loading because they are updated several times during loading and causes this regression: https://github.com/Expensify/App/issues/24596#issuecomment-1681679531
-        if (!isLoading || !reportIDsRef.current || (_.isEmpty(reportIDsRef.current) && currentReportID)) {
+        if (!isLoading || !reportIDsRef.current) {
             reportIDsRef.current = reportIDs;
         }
         return reportIDsRef.current || [];
-    }, [allReportActions, betas, chatReports, currentReportID, policies, priorityMode, isLoading]);
+    }, [allReportActions, betas, chatReports, policies, priorityMode, isLoading]);
+
+    // We need to make sure the current report is in the list of reports, but we do not want
+    // to have to re-generate the list every time the currentReportID changes. To do that
+    // we first generate the list as if there was no current report, then here we check if
+    // the current report is missing from the list, which should very rarely happen. In this
+    // case we re-generate the list a 2nd time with the current report included.
+    const optionListItemsWithCurrentReport = useMemo(() => {
+        if (currentReportID && !_.contains(optionListItems, currentReportID)) {
+            return SidebarUtils.getOrderedReportIDs(currentReportID, chatReports, betas, policies, priorityMode, allReportActions);
+        }
+        return optionListItems;
+    }, [currentReportID, optionListItems, chatReports, betas, policies, priorityMode, allReportActions]);
+
+    const currentReportIDRef = useRef(currentReportID);
+    currentReportIDRef.current = currentReportID;
+    const isActiveReport = useCallback((reportID) => currentReportIDRef.current === reportID, []);
 
     return (
         <View
@@ -94,8 +110,9 @@ function SidebarLinksData({isFocused, allReportActions, betas, chatReports, curr
                 isSmallScreenWidth={isSmallScreenWidth}
                 priorityMode={priorityMode}
                 // Data props:
+                isActiveReport={isActiveReport}
                 isLoading={isLoading}
-                optionListItems={optionListItems}
+                optionListItems={optionListItemsWithCurrentReport}
             />
         </View>
     );
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 0e8553b00dd0..e9ede2c9a89a 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -5,14 +5,12 @@ import lodashGet from 'lodash/get';
 import {View} from 'react-native';
 import styles from '../../../../styles/styles';
 import * as Expensicons from '../../../../components/Icon/Expensicons';
-import * as Browser from '../../../../libs/Browser';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
 import NAVIGATORS from '../../../../NAVIGATORS';
 import SCREENS from '../../../../SCREENS';
 import Permissions from '../../../../libs/Permissions';
 import * as Policy from '../../../../libs/actions/Policy';
-import * as PolicyUtils from '../../../../libs/PolicyUtils';
 import PopoverMenu from '../../../../components/PopoverMenu';
 import CONST from '../../../../CONST';
 import FloatingActionButton from '../../../../components/FloatingActionButton';
@@ -62,9 +60,6 @@ const propTypes = {
     /** Indicated whether the report data is loading */
     isLoading: PropTypes.bool,
 
-    /** For first time users, whether the download app banner should show */
-    shouldShowDownloadAppBanner: PropTypes.bool,
-
     /** Forwarded ref to FloatingActionButtonAndPopover */
     innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
 };
@@ -75,7 +70,6 @@ const defaultProps = {
     betas: [],
     isLoading: false,
     innerRef: null,
-    shouldShowDownloadAppBanner: true,
 };
 
 /**
@@ -158,12 +152,9 @@ function FloatingActionButtonAndPopover(props) {
         if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
             return;
         }
-        // Avoid rendering the create menu for first-time users until they have dismissed the download app banner (mWeb only).
-        if (props.shouldShowDownloadAppBanner && Browser.isMobile()) {
-            return;
-        }
         Welcome.show({routes, showCreateMenu});
-    }, [props.shouldShowDownloadAppBanner, props.navigation, showCreateMenu]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     useEffect(() => {
         if (!didScreenBecomeInactive()) {
@@ -180,8 +171,6 @@ function FloatingActionButtonAndPopover(props) {
         },
     }));
 
-    const workspaces = PolicyUtils.getActivePolicies(props.allPolicies);
-
     return (
         <View>
             <PopoverMenu
@@ -193,23 +182,9 @@ function FloatingActionButtonAndPopover(props) {
                 menuItems={[
                     {
                         icon: Expensicons.ChatBubble,
-                        text: props.translate('sidebarScreen.newChat'),
-                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_CHAT)),
+                        text: props.translate('sidebarScreen.fabNewChat'),
+                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW)),
                     },
-                    {
-                        icon: Expensicons.Users,
-                        text: props.translate('sidebarScreen.newGroup'),
-                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_GROUP)),
-                    },
-                    ...(Permissions.canUsePolicyRooms(props.betas) && workspaces.length
-                        ? [
-                              {
-                                  icon: Expensicons.Hashtag,
-                                  text: props.translate('sidebarScreen.newRoom'),
-                                  onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.WORKSPACE_NEW_ROOM)),
-                              },
-                          ]
-                        : []),
                     ...(Permissions.canUseIOUSend(props.betas)
                         ? [
                               {
@@ -224,16 +199,6 @@ function FloatingActionButtonAndPopover(props) {
                         text: props.translate('iou.requestMoney'),
                         onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)),
                     },
-                    {
-                        icon: Expensicons.Heart,
-                        text: props.translate('sidebarScreen.saveTheWorld'),
-                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.SAVE_THE_WORLD)),
-                    },
-                    {
-                        icon: Expensicons.Receipt,
-                        text: props.translate('iou.splitBill'),
-                        onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)),
-                    },
                     ...(Permissions.canUseTasks(props.betas)
                         ? [
                               {
@@ -260,7 +225,7 @@ function FloatingActionButtonAndPopover(props) {
                 anchorRef={anchorRef}
             />
             <FloatingActionButton
-                accessibilityLabel={props.translate('sidebarScreen.fabNewChat')}
+                accessibilityLabel={props.translate('sidebarScreen.fabNewChatExplained')}
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 isActive={isCreateMenuActive}
                 ref={anchorRef}
@@ -296,9 +261,6 @@ export default compose(
         isLoading: {
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
         },
-        shouldShowDownloadAppBanner: {
-            key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-        },
     }),
 )(
     forwardRef((props, ref) => (
diff --git a/src/pages/iou/DistanceRequestPage.js b/src/pages/iou/DistanceRequestPage.js
index 706ddc43b018..39b068975c77 100644
--- a/src/pages/iou/DistanceRequestPage.js
+++ b/src/pages/iou/DistanceRequestPage.js
@@ -1,38 +1,64 @@
 import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import * as IOU from '../../libs/actions/IOU';
 import ONYXKEYS from '../../ONYXKEYS';
 import DistanceRequest from '../../components/DistanceRequest';
 import reportPropTypes from '../reportPropTypes';
+import CONST from '../../CONST';
+import {iouPropTypes} from './propTypes';
 
 const propTypes = {
-    /** The transactionID of this request */
-    transactionID: PropTypes.string,
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
 
     /** The report on which the request is initiated on */
     report: reportPropTypes,
+
+    /** Passed from the navigator */
+    route: PropTypes.shape({
+        /** Parameters the route gets */
+        params: PropTypes.shape({
+            /** Type of IOU */
+            iouType: PropTypes.oneOf(_.values(CONST.IOU.MONEY_REQUEST_TYPE)),
+            /** Id of the report on which the distance request is being created */
+            reportID: PropTypes.string,
+        }),
+    }),
 };
 
 const defaultProps = {
-    transactionID: '',
+    iou: {},
     report: {},
+    route: {
+        params: {
+            iouType: '',
+            reportID: '',
+        },
+    },
 };
 
 // This component is responsible for getting the transactionID from the IOU key, or creating the transaction if it doesn't exist yet, and then passing the transactionID.
 // You can't use Onyx props in the withOnyx mapping, so we need to set up and access the transactionID here, and then pass it down so that DistanceRequest can subscribe to the transaction.
-function DistanceRequestPage({report, transactionID}) {
+function DistanceRequestPage({iou, report, route}) {
+    const iouType = lodashGet(route, 'params.iouType', '');
+
     useEffect(() => {
-        if (transactionID) {
+        if (iou.transactionID) {
             return;
         }
         IOU.createEmptyTransaction();
-    }, [transactionID]);
+    }, [iou.transactionID]);
 
     return (
         <DistanceRequest
+            iou={iou}
+            iouType={iouType}
             report={report}
-            transactionID={transactionID}
+            route={route}
+            transactionID={iou.transactionID}
         />
     );
 }
@@ -43,5 +69,8 @@ DistanceRequestPage.defaultProps = defaultProps;
 export default withOnyx({
     // We must provide a default value for transactionID here, otherwise the component won't mount
     // because withOnyx returns null until all the keys are defined
-    transactionID: {key: ONYXKEYS.IOU, selector: (iou) => (iou && iou.transactionID) || ''},
+    iou: {key: ONYXKEYS.IOU},
+    report: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+    },
 })(DistanceRequestPage);
diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js
index caf008939519..80f4a5c17e23 100644
--- a/src/pages/iou/IOUCurrencySelection.js
+++ b/src/pages/iou/IOUCurrencySelection.js
@@ -1,4 +1,4 @@
-import React, {useState, useMemo, useCallback} from 'react';
+import React, {useState, useMemo, useCallback, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -70,6 +70,7 @@ const defaultProps = {
 
 function IOUCurrencySelection(props) {
     const [searchValue, setSearchValue] = useState('');
+    const optionsSelectorRef = useRef();
     const selectedCurrencyCode = lodashGet(props.route, 'params.currency', props.iou.currency, CONST.CURRENCY.USD);
 
     const iouType = lodashGet(props.route, 'params.iouType', CONST.IOU.MONEY_REQUEST_TYPE.REQUEST);
@@ -127,7 +128,10 @@ function IOUCurrencySelection(props) {
     }, [currencyList, searchValue, selectedCurrencyCode, translate]);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
@@ -144,6 +148,8 @@ function IOUCurrencySelection(props) {
                         safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         initiallyFocusedOptionKey={initiallyFocusedOptionKey}
                         shouldHaveOptionSeparator
+                        autoFocus={false}
+                        ref={optionsSelectorRef}
                     />
                 </>
             )}
diff --git a/src/pages/iou/MoneyRequestDatePage.js b/src/pages/iou/MoneyRequestDatePage.js
index 33e3609da9aa..68af1a6244b6 100644
--- a/src/pages/iou/MoneyRequestDatePage.js
+++ b/src/pages/iou/MoneyRequestDatePage.js
@@ -11,8 +11,10 @@ import styles from '../../styles/styles';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import * as IOU from '../../libs/actions/IOU';
+import * as MoneyRequestUtils from '../../libs/MoneyRequestUtils';
 import NewDatePicker from '../../components/NewDatePicker';
 import useLocalize from '../../hooks/useLocalize';
+import CONST from '../../CONST';
 import {iouPropTypes, iouDefaultProps} from './propTypes';
 
 const propTypes = {
@@ -37,16 +39,20 @@ const propTypes = {
             threadReportID: PropTypes.string,
         }),
     }).isRequired,
+
+    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
+    selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,
 };
 
 const defaultProps = {
     iou: iouDefaultProps,
 };
 
-function MoneyRequestDatePage({iou, route}) {
+function MoneyRequestDatePage({iou, route, selectedTab}) {
     const {translate} = useLocalize();
     const iouType = lodashGet(route, 'params.iouType', '');
     const reportID = lodashGet(route, 'params.reportID', '');
+    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType, selectedTab);
 
     useEffect(() => {
         const moneyRequestId = `${iouType}${reportID}`;
@@ -55,10 +61,10 @@ function MoneyRequestDatePage({iou, route}) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && (_.isEmpty(iou.participantAccountIDs) || (iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
             Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
         }
-    }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID]);
+    }, [iou.id, iou.participantAccountIDs, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
@@ -109,4 +115,7 @@ export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(MoneyRequestDatePage);
diff --git a/src/pages/iou/MoneyRequestDescriptionPage.js b/src/pages/iou/MoneyRequestDescriptionPage.js
index e64ca595c52e..63aea67ce598 100644
--- a/src/pages/iou/MoneyRequestDescriptionPage.js
+++ b/src/pages/iou/MoneyRequestDescriptionPage.js
@@ -14,6 +14,7 @@ import styles from '../../styles/styles';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import * as IOU from '../../libs/actions/IOU';
+import * as MoneyRequestUtils from '../../libs/MoneyRequestUtils';
 import CONST from '../../CONST';
 import useLocalize from '../../hooks/useLocalize';
 import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
@@ -41,17 +42,21 @@ const propTypes = {
             threadReportID: PropTypes.string,
         }),
     }).isRequired,
+
+    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
+    selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,
 };
 
 const defaultProps = {
     iou: iouDefaultProps,
 };
 
-function MoneyRequestDescriptionPage({iou, route}) {
+function MoneyRequestDescriptionPage({iou, route, selectedTab}) {
     const {translate} = useLocalize();
     const inputRef = useRef(null);
     const iouType = lodashGet(route, 'params.iouType', '');
     const reportID = lodashGet(route, 'params.reportID', '');
+    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType, selectedTab);
 
     useEffect(() => {
         const moneyRequestId = `${iouType}${reportID}`;
@@ -60,10 +65,10 @@ function MoneyRequestDescriptionPage({iou, route}) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && (_.isEmpty(iou.participantAccountIDs) || (iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
             Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
         }
-    }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID]);
+    }, [iou.id, iou.participantAccountIDs, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
@@ -124,4 +129,7 @@ export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(MoneyRequestDescriptionPage);
diff --git a/src/pages/iou/MoneyRequestMerchantPage.js b/src/pages/iou/MoneyRequestMerchantPage.js
index 7969b7918f3d..f8ae810eafba 100644
--- a/src/pages/iou/MoneyRequestMerchantPage.js
+++ b/src/pages/iou/MoneyRequestMerchantPage.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
@@ -58,15 +58,25 @@ function MoneyRequestMerchantPage({iou, route}) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
+        if (_.isEmpty(iou.participantAccountIDs) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
             Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
         }
-    }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID]);
+    }, [iou.id, iou.participantAccountIDs, iou.amount, iou.receiptPath, iouType, reportID]);
 
     function navigateBack() {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
     }
 
+    const validate = useCallback((value) => {
+        const errors = {};
+
+        if (_.isEmpty(value.moneyRequestMerchant)) {
+            errors.moneyRequestMerchant = 'common.error.fieldRequired';
+        }
+
+        return errors;
+    }, []);
+
     /**
      * Sets the money request comment by saving it to Onyx.
      *
@@ -92,6 +102,7 @@ function MoneyRequestMerchantPage({iou, route}) {
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM}
                 onSubmit={(value) => updateMerchant(value)}
+                validate={validate}
                 submitButtonText={translate('common.save')}
                 enabledWhenOffline
             >
diff --git a/src/pages/iou/MoneyRequestSelectorPage.js b/src/pages/iou/MoneyRequestSelectorPage.js
index 03ea45b204fa..33353bf5f4a4 100644
--- a/src/pages/iou/MoneyRequestSelectorPage.js
+++ b/src/pages/iou/MoneyRequestSelectorPage.js
@@ -1,6 +1,6 @@
 import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
-import React from 'react';
+import React, {useState} from 'react';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -17,9 +17,11 @@ import ReceiptSelector from './ReceiptSelector';
 import * as IOU from '../../libs/actions/IOU';
 import DistanceRequestPage from './DistanceRequestPage';
 import DragAndDropProvider from '../../components/DragAndDrop/Provider';
-import usePermissions from '../../hooks/usePermissions';
 import OnyxTabNavigator, {TopTab} from '../../libs/Navigation/OnyxTabNavigator';
 import NewRequestAmountPage from './steps/NewRequestAmountPage';
+import reportPropTypes from '../reportPropTypes';
+import * as ReportUtils from '../../libs/ReportUtils';
+import themeColors from '../../styles/themes/default';
 
 const propTypes = {
     /** React Navigation route */
@@ -34,25 +36,33 @@ const propTypes = {
         }),
     }).isRequired,
 
+    /** Report on which the money request is being created */
+    report: reportPropTypes,
+
     /** Which tab has been selected */
     selectedTab: PropTypes.string,
 };
 
 const defaultProps = {
-    selectedTab: CONST.TAB.MANUAL,
+    selectedTab: CONST.TAB.SCAN,
+    report: {},
 };
 
 function MoneyRequestSelectorPage(props) {
+    const [isDraggingOver, setIsDraggingOver] = useState(false);
+
     const iouType = lodashGet(props.route, 'params.iouType', '');
     const reportID = lodashGet(props.route, 'params.reportID', '');
     const {translate} = useLocalize();
-    const {canUseScanReceipts, canUseDistanceRequests} = usePermissions();
 
     const title = {
         [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST]: translate('iou.requestMoney'),
         [CONST.IOU.MONEY_REQUEST_TYPE.SEND]: translate('iou.sendMoney'),
         [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT]: translate('iou.splitBill'),
     };
+    const isFromGlobalCreate = !reportID;
+    const isExpenseRequest = ReportUtils.isPolicyExpenseChat(props.report);
+    const shouldDisplayDistanceRequest = isExpenseRequest || isFromGlobalCreate;
 
     const resetMoneyRequestInfo = () => {
         const moneyRequestID = `${iouType}${reportID}`;
@@ -63,18 +73,31 @@ function MoneyRequestSelectorPage(props) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
+            headerGapStyles={
+                isDraggingOver
+                    ? [
+                          {
+                              backgroundColor: themeColors.receiptDropUIBG,
+                          },
+                      ]
+                    : []
+            }
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType)}>
-                    <DragAndDropProvider isDisabled={props.selectedTab !== CONST.TAB.SCAN}>
+                    <DragAndDropProvider
+                        isDisabled={props.selectedTab !== CONST.TAB.SCAN}
+                        setIsDraggingOver={setIsDraggingOver}
+                    >
                         <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                             <HeaderWithBackButton
                                 title={title[iouType]}
                                 onBackButtonPress={Navigation.dismissModal}
                             />
-                            {(canUseScanReceipts || canUseDistanceRequests) && iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST ? (
+                            {iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST ? (
                                 <OnyxTabNavigator
                                     id={CONST.TAB.RECEIPT_TAB_ID}
+                                    selectedTab={props.selectedTab}
                                     tabBar={({state, navigation, position}) => (
                                         <TabSelector
                                             state={state}
@@ -89,17 +112,16 @@ function MoneyRequestSelectorPage(props) {
                                         component={NewRequestAmountPage}
                                         initialParams={{reportID, iouType}}
                                     />
-                                    {canUseScanReceipts && (
-                                        <TopTab.Screen
-                                            name={CONST.TAB.SCAN}
-                                            component={ReceiptSelector}
-                                            initialParams={{reportID, iouType}}
-                                        />
-                                    )}
-                                    {canUseDistanceRequests && (
+                                    <TopTab.Screen
+                                        name={CONST.TAB.SCAN}
+                                        component={ReceiptSelector}
+                                        initialParams={{reportID, iouType, pageIndex: 1}}
+                                    />
+                                    {shouldDisplayDistanceRequest && (
                                         <TopTab.Screen
                                             name={CONST.TAB.DISTANCE}
                                             component={DistanceRequestPage}
+                                            initialParams={{reportID, iouType}}
                                         />
                                     )}
                                 </OnyxTabNavigator>
@@ -119,7 +141,10 @@ MoneyRequestSelectorPage.defaultProps = defaultProps;
 MoneyRequestSelectorPage.displayName = 'MoneyRequestSelectorPage';
 
 export default withOnyx({
+    report: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
+    },
     selectedTab: {
-        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
     },
 })(MoneyRequestSelectorPage);
diff --git a/src/pages/iou/MoneyRequestTagPage.js b/src/pages/iou/MoneyRequestTagPage.js
new file mode 100644
index 000000000000..a1795d50df8a
--- /dev/null
+++ b/src/pages/iou/MoneyRequestTagPage.js
@@ -0,0 +1,105 @@
+import React from 'react';
+import _ from 'underscore';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import compose from '../../libs/compose';
+import ROUTES from '../../ROUTES';
+import Navigation from '../../libs/Navigation/Navigation';
+import useLocalize from '../../hooks/useLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import TagPicker from '../../components/TagPicker';
+import Text from '../../components/Text';
+import tagPropTypes from '../../components/tagPropTypes';
+import ONYXKEYS from '../../ONYXKEYS';
+import reportPropTypes from '../reportPropTypes';
+import styles from '../../styles/styles';
+
+const propTypes = {
+    /** Navigation route context info provided by react navigation */
+    route: PropTypes.shape({
+        /** Route specific parameters used on this screen via route :iouType/new/tag/:reportID? */
+        params: PropTypes.shape({
+            /** The type of IOU report, i.e. bill, request, send */
+            iouType: PropTypes.string,
+
+            /** The report ID of the IOU */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /* Onyx props */
+    /** The report currently being used */
+    report: reportPropTypes,
+
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
+};
+
+const defaultProps = {
+    report: {},
+    policyTags: {},
+};
+
+function MoneyRequestTagPage({route, report, policyTags}) {
+    const {translate} = useLocalize();
+
+    const iouType = lodashGet(route, 'params.iouType', '');
+
+    // Fetches the first tag list of the policy
+    const tagListKey = _.first(_.keys(policyTags));
+    const tagList = lodashGet(policyTags, tagListKey, {});
+    const tagListName = lodashGet(tagList, 'name', '');
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, lodashGet(report, 'reportID', '')));
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={tagListName || translate('common.tag')}
+                onBackButtonPress={navigateBack}
+            />
+            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagListName} || translate('common.tag'))}</Text>
+            <TagPicker
+                policyID={report.policyID}
+                reportID={report.reportID}
+                tag={tagListKey}
+                iouType={iouType}
+            />
+        </ScreenWrapper>
+    );
+}
+
+MoneyRequestTagPage.displayName = 'MoneyRequestTagPage';
+MoneyRequestTagPage.propTypes = propTypes;
+MoneyRequestTagPage.defaultProps = defaultProps;
+
+export default compose(
+    withOnyx({
+        iou: {
+            key: ONYXKEYS.IOU,
+        },
+    }),
+    withOnyx({
+        report: {
+            // Fetch report ID from IOU participants if no report ID is set in route
+            key: ({route, iou}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '') || lodashGet(iou, 'participants.0.reportID', '')}`,
+        },
+    }),
+    withOnyx({
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        },
+    }),
+)(MoneyRequestTagPage);
diff --git a/src/pages/iou/ReceiptSelector/CameraPermission/index.android.js b/src/pages/iou/ReceiptSelector/CameraPermission/index.android.js
new file mode 100644
index 000000000000..3eb9ef4eea5a
--- /dev/null
+++ b/src/pages/iou/ReceiptSelector/CameraPermission/index.android.js
@@ -0,0 +1,12 @@
+import {check, PERMISSIONS, request} from 'react-native-permissions';
+
+function requestCameraPermission() {
+    return request(PERMISSIONS.ANDROID.CAMERA);
+}
+
+// Android will never return blocked after a check, you have to request the permission to get the info.
+function getCameraPermissionStatus() {
+    return check(PERMISSIONS.ANDROID.CAMERA);
+}
+
+export {requestCameraPermission, getCameraPermissionStatus};
diff --git a/src/pages/iou/ReceiptSelector/CameraPermission/index.ios.js b/src/pages/iou/ReceiptSelector/CameraPermission/index.ios.js
new file mode 100644
index 000000000000..3c24bfa10d6f
--- /dev/null
+++ b/src/pages/iou/ReceiptSelector/CameraPermission/index.ios.js
@@ -0,0 +1,11 @@
+import {check, PERMISSIONS, request} from 'react-native-permissions';
+
+function requestCameraPermission() {
+    return request(PERMISSIONS.IOS.CAMERA);
+}
+
+function getCameraPermissionStatus() {
+    return check(PERMISSIONS.IOS.CAMERA);
+}
+
+export {requestCameraPermission, getCameraPermissionStatus};
diff --git a/src/pages/iou/ReceiptSelector/CameraPermission/index.js b/src/pages/iou/ReceiptSelector/CameraPermission/index.js
new file mode 100644
index 000000000000..4357b592d7ef
--- /dev/null
+++ b/src/pages/iou/ReceiptSelector/CameraPermission/index.js
@@ -0,0 +1,5 @@
+function requestCameraPermission() {}
+
+function getCameraPermissionStatus() {}
+
+export {requestCameraPermission, getCameraPermissionStatus};
diff --git a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js
new file mode 100644
index 000000000000..8fe00c7a65b3
--- /dev/null
+++ b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js
@@ -0,0 +1,77 @@
+import React, {useEffect, useState} from 'react';
+import {Camera} from 'react-native-vision-camera';
+import {useTabAnimation} from '@react-navigation/material-top-tabs';
+import {useNavigation} from '@react-navigation/native';
+import PropTypes from 'prop-types';
+import refPropTypes from '../../../components/refPropTypes';
+
+const propTypes = {
+    /* The index of the tab that contains this camera */
+    cameraTabIndex: PropTypes.number.isRequired,
+
+    /* Forwarded ref */
+    forwardedRef: refPropTypes.isRequired,
+};
+
+// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
+function NavigationAwareCamera({cameraTabIndex, forwardedRef, ...props}) {
+    // Get navigation to get initial isFocused value (only needed once during init!)
+    const navigation = useNavigation();
+    const [isCameraActive, setIsCameraActive] = useState(navigation.isFocused());
+
+    // Get the animation value from the tab navigator. Its a value between 0 and the
+    // number of pages we render in the tab navigator. When we even just slightly start to scroll to the camera page,
+    // (value is e.g. 0.001 on animation start) we want to activate the camera, so its as fast as possible active.
+    const tabPositionAnimation = useTabAnimation();
+
+    useEffect(() => {
+        const listenerId = tabPositionAnimation.addListener(({value}) => {
+            // Activate camera as soon the index is animating towards the `cameraTabIndex`
+            setIsCameraActive(value > cameraTabIndex - 1 && value < cameraTabIndex + 1);
+        });
+
+        return () => {
+            tabPositionAnimation.removeListener(listenerId);
+        };
+    }, [cameraTabIndex, tabPositionAnimation]);
+
+    // Note: The useEffect can be removed once VisionCamera V3 is used.
+    // Its only needed for android, because there is a native cameraX android bug. With out this flow would break the camera:
+    // 1. Open camera tab
+    // 2. Take a picture
+    // 3. Go back from the opened screen
+    // 4. The camera is not working anymore
+    useEffect(() => {
+        const removeBlurListener = navigation.addListener('blur', () => {
+            setIsCameraActive(false);
+        });
+        const removeFocusListener = navigation.addListener('focus', () => {
+            setIsCameraActive(true);
+        });
+
+        return () => {
+            removeBlurListener();
+            removeFocusListener();
+        };
+    }, [navigation]);
+
+    return (
+        <Camera
+            ref={forwardedRef}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            isActive={isCameraActive}
+        />
+    );
+}
+
+NavigationAwareCamera.propTypes = propTypes;
+NavigationAwareCamera.displayName = 'NavigationAwareCamera';
+
+export default React.forwardRef((props, ref) => (
+    <NavigationAwareCamera
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
diff --git a/src/pages/iou/ReceiptSelector/index.js b/src/pages/iou/ReceiptSelector/index.js
index 94246b1e6fd1..3f5672c3d33d 100644
--- a/src/pages/iou/ReceiptSelector/index.js
+++ b/src/pages/iou/ReceiptSelector/index.js
@@ -141,11 +141,11 @@ function ReceiptSelector(props) {
                 receiptImageTopPosition={receiptImageTopPosition}
             />
             <ConfirmModal
-                title={attachmentInvalidReasonTitle}
+                title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
                 onConfirm={Receipt.clearUploadReceiptError}
                 onCancel={Receipt.clearUploadReceiptError}
                 isVisible={isAttachmentInvalid}
-                prompt={attachmentInvalidReason}
+                prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
                 confirmText={translate('common.close')}
                 shouldShowCancelButton={false}
             />
diff --git a/src/pages/iou/ReceiptSelector/index.native.js b/src/pages/iou/ReceiptSelector/index.native.js
index 88e3af4d4440..4ff32d940c9f 100644
--- a/src/pages/iou/ReceiptSelector/index.native.js
+++ b/src/pages/iou/ReceiptSelector/index.native.js
@@ -1,11 +1,11 @@
 import {ActivityIndicator, Alert, AppState, Linking, Text, View} from 'react-native';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
-import {Camera, useCameraDevices} from 'react-native-vision-camera';
+import {useCameraDevices} from 'react-native-vision-camera';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import {launchImageLibrary} from 'react-native-image-picker';
 import {withOnyx} from 'react-native-onyx';
-import {useIsFocused} from '@react-navigation/native';
+import {RESULTS} from 'react-native-permissions';
 import PressableWithFeedback from '../../../components/Pressable/PressableWithFeedback';
 import Icon from '../../../components/Icon';
 import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -20,7 +20,9 @@ import Button from '../../../components/Button';
 import useLocalize from '../../../hooks/useLocalize';
 import ONYXKEYS from '../../../ONYXKEYS';
 import Log from '../../../libs/Log';
+import * as CameraPermission from './CameraPermission';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
+import NavigationAwareCamera from './NavigationAwareCamera';
 
 const propTypes = {
     /** React Navigation route */
@@ -73,26 +75,26 @@ function getImagePickerOptions(type) {
 }
 
 function ReceiptSelector(props) {
-    const devices = useCameraDevices();
+    const devices = useCameraDevices('wide-angle-camera');
     const device = devices.back;
 
     const camera = useRef(null);
     const [flash, setFlash] = useState(false);
-    const [permissions, setPermissions] = useState('authorized');
+    const [permissions, setPermissions] = useState('granted');
+    const isAndroidBlockedPermissionRef = useRef(false);
     const appState = useRef(AppState.currentState);
 
     const iouType = lodashGet(props.route, 'params.iouType', '');
     const reportID = lodashGet(props.route, 'params.reportID', '');
+    const pageIndex = lodashGet(props.route, 'params.pageIndex', 1);
 
     const {translate} = useLocalize();
-    // Keep track of whether the camera is visible, when we navigate elsewhere, turn off the camera
-    const isFocused = useIsFocused();
 
     // We want to listen to if the app has come back from background and refresh the permissions status to show camera when permissions were granted
     useEffect(() => {
         const subscription = AppState.addEventListener('change', (nextAppState) => {
             if (appState.current.match(/inactive|background/) && nextAppState === 'active') {
-                Camera.getCameraPermissionStatus().then((permissionStatus) => {
+                CameraPermission.getCameraPermissionStatus().then((permissionStatus) => {
                     setPermissions(permissionStatus);
                 });
             }
@@ -135,12 +137,15 @@ function ReceiptSelector(props) {
     };
 
     const askForPermissions = () => {
-        if (permissions === 'not-determined') {
-            Camera.requestCameraPermission().then((permissionStatus) => {
+        // There's no way we can check for the BLOCKED status without requesting the permission first
+        // https://github.com/zoontek/react-native-permissions/blob/a836e114ce3a180b2b23916292c79841a267d828/README.md?plain=1#L670
+        if (permissions === RESULTS.BLOCKED || isAndroidBlockedPermissionRef.current) {
+            Linking.openSettings();
+        } else if (permissions === RESULTS.DENIED) {
+            CameraPermission.requestCameraPermission().then((permissionStatus) => {
                 setPermissions(permissionStatus);
+                isAndroidBlockedPermissionRef.current = permissionStatus === RESULTS.BLOCKED;
             });
-        } else {
-            Linking.openSettings();
         }
     };
 
@@ -193,18 +198,19 @@ function ReceiptSelector(props) {
                 IOU.setMoneyRequestReceipt(`file://${photo.path}`, photo.path);
                 IOU.navigateToNextPage(props.iou, iouType, reportID, props.report);
             })
-            .catch(() => {
+            .catch((error) => {
                 showCameraAlert();
+                Log.warn('Error taking photo', error);
             });
     }, [flash, iouType, props.iou, props.report, reportID, translate]);
 
-    Camera.getCameraPermissionStatus().then((permissionStatus) => {
+    CameraPermission.getCameraPermissionStatus().then((permissionStatus) => {
         setPermissions(permissionStatus);
     });
 
     return (
         <View style={styles.flex1}>
-            {permissions !== CONST.RECEIPT.PERMISSION_AUTHORIZED && (
+            {permissions !== RESULTS.GRANTED && (
                 <View style={[styles.cameraView, styles.permissionView]}>
                     <Hand
                         width={CONST.RECEIPT.HAND_ICON_WIDTH}
@@ -227,7 +233,7 @@ function ReceiptSelector(props) {
                     </PressableWithFeedback>
                 </View>
             )}
-            {permissions === CONST.RECEIPT.PERMISSION_AUTHORIZED && device == null && (
+            {permissions === RESULTS.GRANTED && device == null && (
                 <View style={[styles.cameraView]}>
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -236,14 +242,14 @@ function ReceiptSelector(props) {
                     />
                 </View>
             )}
-            {permissions === CONST.RECEIPT.PERMISSION_AUTHORIZED && device != null && (
-                <Camera
+            {permissions === RESULTS.GRANTED && device != null && (
+                <NavigationAwareCamera
                     ref={camera}
                     device={device}
                     style={[styles.cameraView]}
                     zoom={device.neutralZoom}
-                    isActive={isFocused}
                     photo
+                    cameraTabIndex={pageIndex}
                 />
             )}
             <View style={[styles.flexRow, styles.justifyContentAround, styles.alignItemsCenter, styles.pv3]}>
diff --git a/src/pages/iou/WaypointEditor.js b/src/pages/iou/WaypointEditor.js
index 8536ff8980e6..68e85a34746d 100644
--- a/src/pages/iou/WaypointEditor.js
+++ b/src/pages/iou/WaypointEditor.js
@@ -4,6 +4,7 @@ import lodashGet from 'lodash/get';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import {useIsFocused} from '@react-navigation/native';
 import AddressSearch from '../../components/AddressSearch';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
@@ -74,6 +75,7 @@ const defaultProps = {
 function WaypointEditor({transactionID, route: {params: {iouType = '', waypointIndex = ''} = {}} = {}, transaction, recentWaypoints}) {
     const {windowWidth} = useWindowDimensions();
     const [isDeleteStopModalOpen, setIsDeleteStopModalOpen] = useState(false);
+    const isFocused = useIsFocused();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const textInput = useRef(null);
@@ -107,7 +109,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
 
         // If the user is online and they are trying to save a value without using the autocomplete, show an error message instructing them to use a selected address instead.
         // That enables us to save the address with coordinates when it is selected
-        if (!isOffline && waypointValue !== '') {
+        if (!isOffline && waypointValue !== '' && waypointAddress !== waypointValue) {
             errors[`waypoint${waypointIndex}`] = 'distance.errors.selectSuggestedAddress';
         }
 
@@ -126,6 +128,8 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
         // 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 = {
+                lat: null,
+                lng: null,
                 address: waypointValue,
             };
 
@@ -159,7 +163,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
             onEntryTransitionEnd={() => textInput.current && textInput.current.focus()}
             shouldEnableMaxHeight
         >
-            <FullPageNotFoundView shouldShow={Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount - 1}>
+            <FullPageNotFoundView shouldShow={(Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount - 1) && isFocused}>
                 <HeaderWithBackButton
                     title={translate(wayPointDescriptionKey)}
                     shouldShowBackButton
@@ -218,6 +222,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
                                 state: null,
                             }}
                             predefinedPlaces={recentWaypoints}
+                            resultTypes=""
                         />
                     </View>
                 </Form>
diff --git a/src/pages/iou/WaypointEditorPage.js b/src/pages/iou/WaypointEditorPage.js
index fc659c7806ab..51c03623fb50 100644
--- a/src/pages/iou/WaypointEditorPage.js
+++ b/src/pages/iou/WaypointEditorPage.js
@@ -45,7 +45,5 @@ WaypointEditorPage.displayName = 'WaypointEditorPage';
 WaypointEditorPage.propTypes = propTypes;
 WaypointEditorPage.defaultProps = defaultProps;
 export default withOnyx({
-    // We must provide a default value for transactionID here, otherwise the component won't mount
-    // because withOnyx returns null until all the keys are defined
-    transactionID: {key: ONYXKEYS.IOU, selector: (iou) => (iou && iou.transactionID) || ''},
+    transactionID: {key: ONYXKEYS.IOU, selector: (iou) => iou && iou.transactionID},
 })(WaypointEditorPage);
diff --git a/src/pages/iou/propTypes/index.js b/src/pages/iou/propTypes/index.js
index c7559323ebc1..5ecd00d11876 100644
--- a/src/pages/iou/propTypes/index.js
+++ b/src/pages/iou/propTypes/index.js
@@ -18,6 +18,9 @@ const iouPropTypes = PropTypes.shape({
     /** The merchant name */
     merchant: PropTypes.string,
 
+    /** The tag */
+    tag: PropTypes.string,
+
     /** Date that the request was created */
     created: PropTypes.string,
 
@@ -34,6 +37,7 @@ const iouDefaultProps = {
     currency: CONST.CURRENCY.USD,
     comment: '',
     merchant: '',
+    tag: '',
     created: '',
     participants: [],
     receiptPath: '',
diff --git a/src/pages/iou/steps/MoneyRequestAmountForm.js b/src/pages/iou/steps/MoneyRequestAmountForm.js
index 1d7444397c0e..1ea0b002b235 100644
--- a/src/pages/iou/steps/MoneyRequestAmountForm.js
+++ b/src/pages/iou/steps/MoneyRequestAmountForm.js
@@ -1,5 +1,5 @@
 import React, {useEffect, useState, useCallback, useRef} from 'react';
-import {View} from 'react-native';
+import {ScrollView, View} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
@@ -200,7 +200,7 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
     const buttonText = isEditing ? translate('common.save') : translate('common.next');
 
     return (
-        <>
+        <ScrollView contentContainerStyle={styles.flexGrow1}>
             <View
                 nativeID={AMOUNT_VIEW_ID}
                 onMouseDown={(event) => onMouseDown(event, [AMOUNT_VIEW_ID])}
@@ -253,7 +253,7 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
                     text={buttonText}
                 />
             </View>
-        </>
+        </ScrollView>
     );
 }
 
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index e41b2c6057a7..4216ff7f2f8b 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -1,5 +1,5 @@
 import React, {useCallback, useEffect, useMemo, useRef} from 'react';
-import {View} from 'react-native';
+import {ScrollView, View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -14,6 +14,7 @@ import * as IOU from '../../../libs/actions/IOU';
 import compose from '../../../libs/compose';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import * as OptionsListUtils from '../../../libs/OptionsListUtils';
+import * as MoneyRequestUtils from '../../../libs/MoneyRequestUtils';
 import withLocalize from '../../../components/withLocalize';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ONYXKEYS from '../../../ONYXKEYS';
@@ -22,6 +23,9 @@ import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 import * as FileUtils from '../../../libs/fileDownload/FileUtils';
 import * as Policy from '../../../libs/actions/Policy';
+import useNetwork from '../../../hooks/useNetwork';
+import useWindowDimensions from '../../../hooks/useWindowDimensions';
+import * as StyleUtils from '../../../styles/StyleUtils';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
 
 const propTypes = {
@@ -56,8 +60,11 @@ const defaultProps = {
 };
 
 function MoneyRequestConfirmPage(props) {
+    const {isOffline} = useNetwork();
+    const {windowHeight} = useWindowDimensions();
     const prevMoneyRequestId = useRef(props.iou.id);
     const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
+    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, props.selectedTab);
     const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
     const participants = useMemo(
         () =>
@@ -72,12 +79,15 @@ function MoneyRequestConfirmPage(props) {
         if (policyExpenseChat) {
             Policy.openDraftWorkspaceRequest(policyExpenseChat.policyID);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+        // Verification to reset billable with a default value, when value in IOU was changed
+        if (typeof props.iou.billable !== 'boolean') {
+            IOU.setMoneyRequestBillable(lodashGet(props.policy, 'defaultBillable', false));
+        }
+    }, [isOffline, participants, props.iou.billable, props.policy]);
 
     useEffect(() => {
         // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
-        if (prevMoneyRequestId.current !== props.iou.id) {
+        if (!isDistanceRequest && prevMoneyRequestId.current !== props.iou.id) {
             // The ID is cleared on completing a request. In that case, we will do nothing.
             if (props.iou.id) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), true);
@@ -87,19 +97,19 @@ function MoneyRequestConfirmPage(props) {
 
         // Reset the money request Onyx if the ID in Onyx does not match the ID from params
         const moneyRequestId = `${iouType.current}${reportID.current}`;
-        const shouldReset = props.iou.id !== moneyRequestId;
+        const shouldReset = !isDistanceRequest && props.iou.id !== moneyRequestId;
         if (shouldReset) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(props.iou.participants) || (props.iou.amount === 0 && !props.iou.receiptPath) || shouldReset) {
+        if (_.isEmpty(props.iou.participants) || (props.iou.amount === 0 && !props.iou.receiptPath && !isDistanceRequest) || shouldReset) {
             Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), true);
         }
 
         return () => {
             prevMoneyRequestId.current = props.iou.id;
         };
-    }, [props.iou.participants, props.iou.amount, props.iou.id, props.iou.receiptPath]);
+    }, [props.iou.participants, props.iou.amount, props.iou.id, props.iou.receiptPath, isDistanceRequest]);
 
     const navigateBack = () => {
         let fallback;
@@ -129,9 +139,42 @@ function MoneyRequestConfirmPage(props) {
                 selectedParticipants[0],
                 trimmedComment,
                 receipt,
+                props.iou.category,
+                props.iou.billable,
             );
         },
-        [props.report, props.iou.amount, props.iou.currency, props.iou.created, props.iou.merchant, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID],
+        [
+            props.report,
+            props.iou.amount,
+            props.iou.currency,
+            props.iou.created,
+            props.iou.merchant,
+            props.currentUserPersonalDetails.login,
+            props.currentUserPersonalDetails.accountID,
+            props.iou.category,
+            props.iou.billable,
+        ],
+    );
+
+    /**
+     * @param {Array} selectedParticipants
+     * @param {String} trimmedComment
+     */
+    const createDistanceRequest = useCallback(
+        (selectedParticipants, trimmedComment) => {
+            IOU.createDistanceRequest(
+                props.report,
+                selectedParticipants[0],
+                trimmedComment,
+                props.iou.created,
+                props.iou.transactionID,
+                props.iou.category,
+                props.iou.amount,
+                props.iou.currency,
+                props.iou.merchant,
+            );
+        },
+        [props.report, props.iou.created, props.iou.transactionID, props.iou.category, props.iou.amount, props.iou.currency, props.iou.merchant],
     );
 
     const createTransaction = useCallback(
@@ -173,6 +216,11 @@ function MoneyRequestConfirmPage(props) {
                 return;
             }
 
+            if (isDistanceRequest) {
+                createDistanceRequest(selectedParticipants, trimmedComment);
+                return;
+            }
+
             requestMoney(selectedParticipants, trimmedComment);
         },
         [
@@ -183,7 +231,9 @@ function MoneyRequestConfirmPage(props) {
             props.iou.currency,
             props.iou.receiptPath,
             props.iou.receiptSource,
+            isDistanceRequest,
             requestMoney,
+            createDistanceRequest,
         ],
     );
 
@@ -203,11 +253,6 @@ function MoneyRequestConfirmPage(props) {
                 return;
             }
 
-            if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
-                IOU.sendMoneyViaPaypal(props.report, props.iou.amount, currency, trimmedComment, props.currentUserPersonalDetails.accountID, participant);
-                return;
-            }
-
             if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
                 IOU.sendMoneyWithWallet(props.report, props.iou.amount, currency, trimmedComment, props.currentUserPersonalDetails.accountID, participant);
             }
@@ -215,46 +260,77 @@ function MoneyRequestConfirmPage(props) {
         [props.iou.amount, props.iou.comment, participants, props.iou.currency, props.currentUserPersonalDetails.accountID, props.report],
     );
 
+    const headerTitle = () => {
+        if (isDistanceRequest) {
+            return props.translate('common.distance');
+        }
+
+        if (iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT) {
+            return props.translate('iou.split');
+        }
+
+        return props.translate('tabSelector.manual');
+    };
+
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
-                        title={props.translate('iou.cash')}
+                        title={headerTitle()}
                         onBackButtonPress={navigateBack}
                     />
-                    <MoneyRequestConfirmationList
-                        hasMultipleParticipants={iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT}
-                        selectedParticipants={participants}
-                        iouAmount={props.iou.amount}
-                        iouComment={props.iou.comment}
-                        iouCurrencyCode={props.iou.currency}
-                        onConfirm={createTransaction}
-                        onSendMoney={sendMoney}
-                        onSelectParticipant={(option) => {
-                            const newParticipants = _.map(props.iou.participants, (participant) => {
-                                if (participant.accountID === option.accountID) {
-                                    return {...participant, selected: !participant.selected};
-                                }
-                                return participant;
-                            });
-                            IOU.setMoneyRequestParticipants(newParticipants);
-                        }}
-                        receiptPath={props.iou.receiptPath}
-                        receiptSource={props.iou.receiptSource}
-                        iouType={iouType.current}
-                        reportID={reportID.current}
-                        // The participants can only be modified when the action is initiated from directly within a group chat and not the floating-action-button.
-                        // This is because when there is a group of people, say they are on a trip, and you have some shared expenses with some of the people,
-                        // but not all of them (maybe someone skipped out on dinner). Then it's nice to be able to select/deselect people from the group chat bill
-                        // split rather than forcing the user to create a new group, just for that expense. The reportID is empty, when the action was initiated from
-                        // the floating-action-button (since it is something that exists outside the context of a report).
-                        canModifyParticipants={!_.isEmpty(reportID.current)}
-                        policyID={props.report.policyID}
-                        bankAccountRoute={ReportUtils.getBankAccountRoute(props.report)}
-                        iouMerchant={props.iou.merchant}
-                        iouCreated={props.iou.created}
-                    />
+                    {/*
+                     * The MoneyRequestConfirmationList component uses a SectionList which uses a VirtualizedList internally.
+                     * VirtualizedList cannot be directly nested within ScrollViews of the same orientation.
+                     * To work around this, we wrap the MoneyRequestConfirmationList component with a horizontal ScrollView.
+                     */}
+                    <ScrollView contentContainerStyle={[styles.flexGrow1]}>
+                        <ScrollView
+                            horizontal
+                            contentContainerStyle={[styles.flex1, styles.flexColumn]}
+                        >
+                            <MoneyRequestConfirmationList
+                                transactionID={props.iou.transactionID}
+                                hasMultipleParticipants={iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT}
+                                selectedParticipants={participants}
+                                iouAmount={props.iou.amount}
+                                iouComment={props.iou.comment}
+                                iouCurrencyCode={props.iou.currency}
+                                iouIsBillable={props.iou.billable}
+                                onToggleBillable={IOU.setMoneyRequestBillable}
+                                iouCategory={props.iou.category}
+                                iouTag={props.iou.tag}
+                                onConfirm={createTransaction}
+                                onSendMoney={sendMoney}
+                                onSelectParticipant={(option) => {
+                                    const newParticipants = _.map(props.iou.participants, (participant) => {
+                                        if (participant.accountID === option.accountID) {
+                                            return {...participant, selected: !participant.selected};
+                                        }
+                                        return participant;
+                                    });
+                                    IOU.setMoneyRequestParticipants(newParticipants);
+                                }}
+                                receiptPath={props.iou.receiptPath}
+                                receiptSource={props.iou.receiptSource}
+                                iouType={iouType.current}
+                                reportID={reportID.current}
+                                // The participants can only be modified when the action is initiated from directly within a group chat and not the floating-action-button.
+                                // This is because when there is a group of people, say they are on a trip, and you have some shared expenses with some of the people,
+                                // but not all of them (maybe someone skipped out on dinner). Then it's nice to be able to select/deselect people from the group chat bill
+                                // split rather than forcing the user to create a new group, just for that expense. The reportID is empty, when the action was initiated from
+                                // the floating-action-button (since it is something that exists outside the context of a report).
+                                canModifyParticipants={!_.isEmpty(reportID.current)}
+                                policyID={props.report.policyID}
+                                bankAccountRoute={ReportUtils.getBankAccountRoute(props.report)}
+                                iouMerchant={props.iou.merchant}
+                                iouCreated={props.iou.created}
+                                isDistanceRequest={isDistanceRequest}
+                                listStyles={[StyleUtils.getMaximumHeight(windowHeight / 3)]}
+                            />
+                        </ScrollView>
+                    </ScrollView>
                 </View>
             )}
         </ScreenWrapper>
@@ -269,14 +345,32 @@ export default compose(
     withCurrentUserPersonalDetails,
     withLocalize,
     withOnyx({
-        report: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
-        },
         iou: {
             key: ONYXKEYS.IOU,
         },
+    }),
+    withOnyx({
+        report: {
+            key: ({route, iou}) => {
+                let reportID = lodashGet(route, 'params.reportID', '');
+                if (!reportID) {
+                    // When the money request creation flow is initialized on Global Create, the reportID is not passed as a navigation parameter.
+                    // Get the report id from the participants list on the IOU object stored in Onyx.
+                    reportID = lodashGet(iou, 'participants.0.reportID', '');
+                }
+                return `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+            },
+        },
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
+        selectedTab: {
+            key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+        },
+    }),
+    withOnyx({
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`,
+        },
     }),
 )(MoneyRequestConfirmPage);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
index 0b13173f5c90..1d9f12a9cdbb 100644
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
@@ -1,22 +1,22 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import CONST from '../../../../CONST';
 import ONYXKEYS from '../../../../ONYXKEYS';
 import ROUTES from '../../../../ROUTES';
-import MoneyRequestParticipantsSplitSelector from './MoneyRequestParticipantsSplitSelector';
 import MoneyRequestParticipantsSelector from './MoneyRequestParticipantsSelector';
 import styles from '../../../../styles/styles';
 import ScreenWrapper from '../../../../components/ScreenWrapper';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
 import Navigation from '../../../../libs/Navigation/Navigation';
-import compose from '../../../../libs/compose';
 import * as DeviceCapabilities from '../../../../libs/DeviceCapabilities';
 import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
 import * as IOU from '../../../../libs/actions/IOU';
+import * as MoneyRequestUtils from '../../../../libs/MoneyRequestUtils';
 import {iouPropTypes, iouDefaultProps} from '../../propTypes';
+import useLocalize from '../../../../hooks/useLocalize';
 
 const propTypes = {
     /** React Navigation route */
@@ -34,20 +34,37 @@ const propTypes = {
     /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
     iou: iouPropTypes,
 
-    ...withLocalizePropTypes,
+    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
+    selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,
 };
 
 const defaultProps = {
     iou: iouDefaultProps,
 };
 
-function MoneyRequestParticipantsPage(props) {
-    const prevMoneyRequestId = useRef(props.iou.id);
-    const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
-    const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
+function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
+    const {translate} = useLocalize();
+    const prevMoneyRequestId = useRef(iou.id);
+    const isNewReportIDSelectedLocally = useRef(false);
+    const optionsSelectorRef = useRef();
+    const iouType = useRef(lodashGet(route, 'params.iouType', ''));
+    const reportID = useRef(lodashGet(route, 'params.reportID', ''));
+    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, selectedTab);
+    const isSplitRequest = iou.id === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT;
+    const [headerTitle, setHeaderTitle] = useState();
 
-    const navigateToNextStep = () => {
-        Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
+    useEffect(() => {
+        if (isDistanceRequest) {
+            setHeaderTitle(translate('common.distance'));
+            return;
+        }
+
+        setHeaderTitle(_.isEmpty(iou.participants) ? translate('tabSelector.manual') : translate('iou.split'));
+    }, [iou.participants, isDistanceRequest, translate]);
+
+    const navigateToNextStep = (moneyRequestType) => {
+        IOU.setMoneyRequestId(moneyRequestType);
+        Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(moneyRequestType, reportID.current));
     };
 
     const navigateBack = (forceFallback = false) => {
@@ -56,9 +73,9 @@ function MoneyRequestParticipantsPage(props) {
 
     useEffect(() => {
         // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
-        if (prevMoneyRequestId.current !== props.iou.id) {
+        if (prevMoneyRequestId.current !== iou.id) {
             // The ID is cleared on completing a request. In that case, we will do nothing
-            if (props.iou.id) {
+            if (iou.id && !isDistanceRequest && !isSplitRequest && !isNewReportIDSelectedLocally.current) {
                 navigateBack(true);
             }
             return;
@@ -66,46 +83,41 @@ function MoneyRequestParticipantsPage(props) {
 
         // Reset the money request Onyx if the ID in Onyx does not match the ID from params
         const moneyRequestId = `${iouType.current}${reportID.current}`;
-        const shouldReset = props.iou.id !== moneyRequestId;
+        const shouldReset = iou.id !== moneyRequestId && !isNewReportIDSelectedLocally.current;
         if (shouldReset) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
-
-        if ((props.iou.amount === 0 && !props.iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && ((iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
             navigateBack(true);
         }
 
         return () => {
-            prevMoneyRequestId.current = props.iou.id;
+            prevMoneyRequestId.current = iou.id;
         };
-    }, [props.iou.amount, props.iou.id, props.iou.receiptPath]);
+    }, [iou.amount, iou.id, iou.receiptPath, isDistanceRequest, isSplitRequest]);
 
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
+            onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={styles.flex1}>
                     <HeaderWithBackButton
-                        title={props.translate('iou.cash')}
+                        title={headerTitle}
                         onBackButtonPress={navigateBack}
                     />
-                    {iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT ? (
-                        <MoneyRequestParticipantsSplitSelector
-                            onStepComplete={navigateToNextStep}
-                            participants={props.iou.participants}
-                            onAddParticipants={IOU.setMoneyRequestParticipants}
-                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                        />
-                    ) : (
-                        <MoneyRequestParticipantsSelector
-                            onStepComplete={navigateToNextStep}
-                            onAddParticipants={IOU.setMoneyRequestParticipants}
-                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                            iouType={iouType.current}
-                        />
-                    )}
+                    <MoneyRequestParticipantsSelector
+                        ref={(el) => (optionsSelectorRef.current = el)}
+                        participants={iou.participants}
+                        onAddParticipants={IOU.setMoneyRequestParticipants}
+                        navigateToRequest={() => navigateToNextStep(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)}
+                        navigateToSplit={() => navigateToNextStep(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)}
+                        safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                        iouType={iouType.current}
+                        isDistanceRequest={isDistanceRequest}
+                    />
                 </View>
             )}
         </ScreenWrapper>
@@ -116,9 +128,11 @@ MoneyRequestParticipantsPage.displayName = 'IOUParticipantsPage';
 MoneyRequestParticipantsPage.propTypes = propTypes;
 MoneyRequestParticipantsPage.defaultProps = defaultProps;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        iou: {key: ONYXKEYS.IOU},
-    }),
-)(MoneyRequestParticipantsPage);
+export default withOnyx({
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
+    selectedTab: {
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
+})(MoneyRequestParticipantsPage);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
index 9f59c55f6337..9ff787ebe21b 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -1,27 +1,48 @@
-import React, {Component} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import ONYXKEYS from '../../../../ONYXKEYS';
+import styles from '../../../../styles/styles';
+import OptionsSelector from '../../../../components/OptionsSelector';
 import * as OptionsListUtils from '../../../../libs/OptionsListUtils';
 import * as ReportUtils from '../../../../libs/ReportUtils';
-import OptionsSelector from '../../../../components/OptionsSelector';
-import ONYXKEYS from '../../../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
+import * as Browser from '../../../../libs/Browser';
 import compose from '../../../../libs/compose';
 import CONST from '../../../../CONST';
 import personalDetailsPropType from '../../../personalDetailsPropType';
 import reportPropTypes from '../../../reportPropTypes';
+import refPropTypes from '../../../../components/refPropTypes';
 
 const propTypes = {
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
-    /** Callback to inform parent modal of success */
-    onStepComplete: PropTypes.func.isRequired,
+    /** Callback to request parent modal to go to next step, which should be split */
+    navigateToRequest: PropTypes.func.isRequired,
+
+    /** Callback to request parent modal to go to next step, which should be split */
+    navigateToSplit: PropTypes.func.isRequired,
+
+    /** A ref to forward to options selector's text input */
+    forwardedRef: refPropTypes,
 
     /** Callback to add participants in MoneyRequestModal */
     onAddParticipants: PropTypes.func.isRequired,
 
+    /** Selected participants from MoneyRequestModal with login */
+    participants: PropTypes.arrayOf(
+        PropTypes.shape({
+            accountID: PropTypes.number,
+            login: PropTypes.string,
+            isPolicyExpenseChat: PropTypes.bool,
+            isOwnPolicyExpenseChat: PropTypes.bool,
+            selected: PropTypes.bool,
+        }),
+    ),
+
     /** All of the personal details for everyone */
     personalDetails: PropTypes.objectOf(personalDetailsPropType),
 
@@ -34,148 +55,209 @@ const propTypes = {
     /** The type of IOU report, i.e. bill, request, send */
     iouType: PropTypes.string.isRequired,
 
-    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
-    selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,
+    /** Whether the money request is a distance request or not */
+    isDistanceRequest: PropTypes.bool,
 
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
+    participants: [],
+    forwardedRef: undefined,
     safeAreaPaddingBottomStyle: {},
     personalDetails: {},
     reports: {},
     betas: [],
+    isDistanceRequest: false,
 };
 
-class MoneyRequestParticipantsSelector extends Component {
-    constructor(props) {
-        super(props);
-
-        this.addSingleParticipant = this.addSingleParticipant.bind(this);
-        this.updateOptionsWithSearchTerm = this.updateOptionsWithSearchTerm.bind(this);
+function MoneyRequestParticipantsSelector({
+    forwardedRef,
+    betas,
+    participants,
+    personalDetails,
+    reports,
+    translate,
+    navigateToRequest,
+    navigateToSplit,
+    onAddParticipants,
+    safeAreaPaddingBottomStyle,
+    iouType,
+    isDistanceRequest,
+}) {
+    const [searchTerm, setSearchTerm] = useState('');
+    const [newChatOptions, setNewChatOptions] = useState({
+        recentReports: [],
+        personalDetails: [],
+        userToInvite: null,
+    });
 
-        const {recentReports, personalDetails, userToInvite} = this.getRequestOptions();
-
-        this.state = {
-            recentReports,
-            personalDetails,
-            userToInvite,
-            searchTerm: '',
-        };
-    }
-
-    componentDidUpdate(prevProps) {
-        if (_.isEqual(prevProps.reports, this.props.reports) && _.isEqual(prevProps.personalDetails, this.props.personalDetails)) {
-            return;
-        }
-        this.updateOptionsWithSearchTerm(this.state.searchTerm);
-    }
-
-    /**
-     * @param {string} searchTerm
-     * @returns {Object}
-     */
-    getRequestOptions(searchTerm = '') {
-        return OptionsListUtils.getNewChatOptions(
-            this.props.reports,
-            this.props.personalDetails,
-            this.props.betas,
-            searchTerm,
-            [],
-            CONST.EXPENSIFY_EMAILS,
-
-            // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
-            // sees the option to request money from their admin on their own Workspace Chat.
-            this.props.iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
-
-            // We don't want to include any P2P options like personal details or reports that are not workspace chats for certain features.
-            this.props.selectedTab !== CONST.TAB.DISTANCE,
-        );
-    }
+    const maxParticipantsReached = participants.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
 
     /**
      * Returns the sections needed for the OptionsSelector
      *
      * @returns {Array}
      */
-    getSections() {
-        const sections = [];
+    const sections = useMemo(() => {
+        const newSections = [];
         let indexOffset = 0;
 
-        sections.push({
-            title: this.props.translate('common.recents'),
-            data: this.state.recentReports,
-            shouldShow: !_.isEmpty(this.state.recentReports),
+        newSections.push({
+            title: undefined,
+            data: OptionsListUtils.getParticipantsOptions(participants, personalDetails),
+            shouldShow: true,
             indexOffset,
         });
-        indexOffset += this.state.recentReports.length;
+        indexOffset += participants.length;
 
-        sections.push({
-            title: this.props.translate('common.contacts'),
-            data: this.state.personalDetails,
-            shouldShow: !_.isEmpty(this.state.personalDetails),
+        if (maxParticipantsReached) {
+            return newSections;
+        }
+
+        newSections.push({
+            title: translate('common.recents'),
+            data: newChatOptions.recentReports,
+            shouldShow: !_.isEmpty(newChatOptions.recentReports),
             indexOffset,
         });
-        indexOffset += this.state.personalDetails.length;
+        indexOffset += newChatOptions.recentReports.length;
 
-        if (this.state.userToInvite && !OptionsListUtils.isCurrentUser(this.state.userToInvite)) {
-            sections.push({
+        newSections.push({
+            title: translate('common.contacts'),
+            data: newChatOptions.personalDetails,
+            shouldShow: !_.isEmpty(newChatOptions.personalDetails),
+            indexOffset,
+        });
+        indexOffset += newChatOptions.personalDetails.length;
+
+        if (newChatOptions.userToInvite && !OptionsListUtils.isCurrentUser(newChatOptions.userToInvite)) {
+            newSections.push({
                 undefined,
-                data: [this.state.userToInvite],
+                data: [newChatOptions.userToInvite],
                 shouldShow: true,
                 indexOffset,
             });
         }
 
-        return sections;
-    }
-
-    updateOptionsWithSearchTerm(searchTerm = '') {
-        const {recentReports, personalDetails, userToInvite} = this.getRequestOptions(searchTerm);
-        this.setState({
-            searchTerm,
-            recentReports,
-            userToInvite,
-            personalDetails,
-        });
-    }
+        return newSections;
+    }, [maxParticipantsReached, newChatOptions, participants, personalDetails, translate]);
 
     /**
      * Adds a single participant to the request
      *
      * @param {Object} option
      */
-    addSingleParticipant(option) {
-        this.props.onAddParticipants([{accountID: option.accountID, login: option.login, isPolicyExpenseChat: option.isPolicyExpenseChat, reportID: option.reportID, selected: true}]);
-        this.props.onStepComplete();
-    }
-
-    render() {
-        const headerMessage = OptionsListUtils.getHeaderMessage(
-            this.state.personalDetails.length + this.state.recentReports.length !== 0,
-            Boolean(this.state.userToInvite),
-            this.state.searchTerm,
+    const addSingleParticipant = (option) => {
+        onAddParticipants([{accountID: option.accountID, login: option.login, isPolicyExpenseChat: option.isPolicyExpenseChat, reportID: option.reportID, selected: true}]);
+        navigateToRequest();
+    };
+
+    /**
+     * Removes a selected option from list if already selected. If not already selected add this option to the list.
+     * @param {Object} option
+     */
+    const addParticipantToSelection = useCallback(
+        (option) => {
+            const isOptionInList = _.some(participants, (selectedOption) => selectedOption.accountID === option.accountID);
+
+            let newSelectedOptions;
+
+            if (isOptionInList) {
+                newSelectedOptions = _.reject(participants, (selectedOption) => selectedOption.accountID === option.accountID);
+            } else {
+                newSelectedOptions = [...participants, {accountID: option.accountID, login: option.login, selected: true}];
+            }
+
+            onAddParticipants(newSelectedOptions);
+
+            const chatOptions = OptionsListUtils.getNewChatOptions(
+                reports,
+                personalDetails,
+                betas,
+                isOptionInList ? searchTerm : '',
+                newSelectedOptions,
+                CONST.EXPENSIFY_EMAILS,
+
+                // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
+                // sees the option to request money from their admin on their own Workspace Chat.
+                iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
+
+                // We don't want to include any P2P options like personal details or reports that are not workspace chats for certain features.
+                !isDistanceRequest,
+            );
+
+            setNewChatOptions({
+                recentReports: chatOptions.recentReports,
+                personalDetails: chatOptions.personalDetails,
+                userToInvite: chatOptions.userToInvite,
+            });
+        },
+        [participants, onAddParticipants, reports, personalDetails, betas, searchTerm, iouType, isDistanceRequest],
+    );
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(
+        newChatOptions.personalDetails.length + newChatOptions.recentReports.length !== 0,
+        Boolean(newChatOptions.userToInvite),
+        searchTerm,
+        maxParticipantsReached,
+    );
+    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
+
+    useEffect(() => {
+        const chatOptions = OptionsListUtils.getNewChatOptions(
+            reports,
+            personalDetails,
+            betas,
+            searchTerm,
+            participants,
+            CONST.EXPENSIFY_EMAILS,
+
+            // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
+            // sees the option to request money from their admin on their own Workspace Chat.
+            iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
+
+            // We don't want to include any P2P options like personal details or reports that are not workspace chats for certain features.
+            !isDistanceRequest,
         );
-        const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails);
+        setNewChatOptions({
+            recentReports: chatOptions.recentReports,
+            personalDetails: chatOptions.personalDetails,
+            userToInvite: chatOptions.userToInvite,
+        });
+    }, [betas, reports, participants, personalDetails, translate, searchTerm, setNewChatOptions, iouType, isDistanceRequest]);
 
-        return (
+    return (
+        <View style={[styles.flex1, styles.w100, participants.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
             <OptionsSelector
-                sections={this.getSections()}
-                value={this.state.searchTerm}
-                onSelectRow={this.addSingleParticipant}
-                onChangeText={this.updateOptionsWithSearchTerm}
+                canSelectMultipleOptions
+                shouldShowMultipleOptionSelectorAsButton
+                multipleOptionSelectorButtonText={translate('iou.split')}
+                onAddToSelection={addParticipantToSelection}
+                sections={sections}
+                selectedOptions={participants}
+                value={searchTerm}
+                onSelectRow={addSingleParticipant}
+                onChangeText={setSearchTerm}
+                ref={forwardedRef}
                 headerMessage={headerMessage}
-                textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                 boldStyle
-                safeAreaPaddingBottomStyle={this.props.safeAreaPaddingBottomStyle}
+                shouldShowConfirmButton
+                confirmButtonText={translate('iou.addToSplit')}
+                onConfirmSelection={navigateToSplit}
+                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                 shouldShowOptions={isOptionsDataReady}
+                shouldFocusOnSelectRow={!Browser.isMobile()}
+                shouldDelayFocus
             />
-        );
-    }
+        </View>
+    );
 }
 
 MoneyRequestParticipantsSelector.propTypes = propTypes;
 MoneyRequestParticipantsSelector.defaultProps = defaultProps;
+MoneyRequestParticipantsSelector.displayName = 'MoneyRequestParticipantsSelector';
 
 export default compose(
     withLocalize,
@@ -189,8 +271,13 @@ export default compose(
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        selectedTab: {
-            key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
-        },
     }),
-)(MoneyRequestParticipantsSelector);
+)(
+    React.forwardRef((props, ref) => (
+        <MoneyRequestParticipantsSelector
+            /* eslint-disable-next-line react/jsx-props-no-spreading */
+            {...props}
+            forwardedRef={ref}
+        />
+    )),
+);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js
deleted file mode 100755
index 2ebddbdd8741..000000000000
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import _ from 'underscore';
-import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../../../../ONYXKEYS';
-import styles from '../../../../styles/styles';
-import OptionsSelector from '../../../../components/OptionsSelector';
-import * as OptionsListUtils from '../../../../libs/OptionsListUtils';
-import * as ReportUtils from '../../../../libs/ReportUtils';
-import CONST from '../../../../CONST';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
-import compose from '../../../../libs/compose';
-import personalDetailsPropType from '../../../personalDetailsPropType';
-import * as Browser from '../../../../libs/Browser';
-import reportPropTypes from '../../../reportPropTypes';
-
-const propTypes = {
-    /** Beta features list */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
-    /** Callback to inform parent modal of success */
-    onStepComplete: PropTypes.func.isRequired,
-
-    /** Callback to add participants in MoneyRequestModal */
-    onAddParticipants: PropTypes.func.isRequired,
-
-    /** Selected participants from MoneyRequestModal with login */
-    participants: PropTypes.arrayOf(
-        PropTypes.shape({
-            accountID: PropTypes.number,
-            login: PropTypes.string,
-            isPolicyExpenseChat: PropTypes.bool,
-            isOwnPolicyExpenseChat: PropTypes.bool,
-            selected: PropTypes.bool,
-        }),
-    ),
-
-    /** All of the personal details for everyone */
-    personalDetails: PropTypes.objectOf(personalDetailsPropType),
-
-    /** All reports shared with the user */
-    reports: PropTypes.objectOf(reportPropTypes),
-
-    /** padding bottom style of safe area */
-    safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    participants: [],
-    betas: [],
-    personalDetails: {},
-    reports: {},
-    safeAreaPaddingBottomStyle: {},
-};
-
-function MoneyRequestParticipantsSplitSelector({betas, participants, personalDetails, reports, translate, onAddParticipants, onStepComplete, safeAreaPaddingBottomStyle}) {
-    const [searchTerm, setSearchTerm] = useState('');
-    const [newChatOptions, setNewChatOptions] = useState({
-        recentReports: [],
-        personalDetails: [],
-        userToInvite: null,
-    });
-
-    const maxParticipantsReached = participants.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
-
-    /**
-     * Returns the sections needed for the OptionsSelector
-     *
-     * @param {Boolean} maxParticipantsReached
-     * @returns {Array}
-     */
-    const sections = useMemo(() => {
-        const newSections = [];
-        let indexOffset = 0;
-
-        newSections.push({
-            title: undefined,
-            data: OptionsListUtils.getParticipantsOptions(participants, personalDetails),
-            shouldShow: true,
-            indexOffset,
-        });
-        indexOffset += participants.length;
-
-        if (maxParticipantsReached) {
-            return newSections;
-        }
-
-        newSections.push({
-            title: translate('common.recents'),
-            data: newChatOptions.recentReports,
-            shouldShow: !_.isEmpty(newChatOptions.recentReports),
-            indexOffset,
-        });
-        indexOffset += newChatOptions.recentReports.length;
-
-        newSections.push({
-            title: translate('common.contacts'),
-            data: newChatOptions.personalDetails,
-            shouldShow: !_.isEmpty(newChatOptions.personalDetails),
-            indexOffset,
-        });
-        indexOffset += newChatOptions.personalDetails.length;
-
-        if (newChatOptions.userToInvite && !OptionsListUtils.isCurrentUser(newChatOptions.userToInvite)) {
-            newSections.push({
-                undefined,
-                data: [newChatOptions.userToInvite],
-                shouldShow: true,
-                indexOffset,
-            });
-        }
-
-        return newSections;
-    }, [maxParticipantsReached, newChatOptions, participants, personalDetails, translate]);
-
-    /**
-     * Removes a selected option from list if already selected. If not already selected add this option to the list.
-     * @param {Object} option
-     */
-    const toggleOption = useCallback(
-        (option) => {
-            const isOptionInList = _.some(participants, (selectedOption) => selectedOption.accountID === option.accountID);
-
-            let newSelectedOptions;
-
-            if (isOptionInList) {
-                newSelectedOptions = _.reject(participants, (selectedOption) => selectedOption.accountID === option.accountID);
-            } else {
-                newSelectedOptions = [...participants, {accountID: option.accountID, login: option.login, selected: true, searchText: option.searchText}];
-            }
-
-            onAddParticipants(newSelectedOptions);
-
-            const chatOptions = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, isOptionInList ? searchTerm : '', newSelectedOptions, CONST.EXPENSIFY_EMAILS);
-
-            setNewChatOptions({
-                recentReports: chatOptions.recentReports,
-                personalDetails: chatOptions.personalDetails,
-                userToInvite: chatOptions.userToInvite,
-            });
-        },
-        [searchTerm, participants, onAddParticipants, reports, personalDetails, betas, setNewChatOptions],
-    );
-
-    const headerMessage = OptionsListUtils.getHeaderMessage(
-        newChatOptions.personalDetails.length + newChatOptions.recentReports.length !== 0,
-        Boolean(newChatOptions.userToInvite),
-        searchTerm,
-        maxParticipantsReached,
-        _.some(participants, (participant) => participant.searchText.toLowerCase().includes(searchTerm.toLowerCase())),
-    );
-    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
-
-    useEffect(() => {
-        const chatOptions = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, searchTerm, participants, CONST.EXPENSIFY_EMAILS);
-        setNewChatOptions({
-            recentReports: chatOptions.recentReports,
-            personalDetails: chatOptions.personalDetails,
-            userToInvite: chatOptions.userToInvite,
-        });
-    }, [betas, reports, participants, personalDetails, translate, searchTerm, setNewChatOptions]);
-
-    return (
-        <View style={[styles.flex1, styles.w100, participants.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
-            <OptionsSelector
-                canSelectMultipleOptions
-                sections={sections}
-                selectedOptions={participants}
-                value={searchTerm}
-                onSelectRow={toggleOption}
-                onChangeText={setSearchTerm}
-                headerMessage={headerMessage}
-                boldStyle
-                shouldShowConfirmButton
-                confirmButtonText={translate('common.next')}
-                onConfirmSelection={onStepComplete}
-                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
-                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                shouldShowOptions={isOptionsDataReady}
-                shouldFocusOnSelectRow={!Browser.isMobile()}
-            />
-        </View>
-    );
-}
-
-MoneyRequestParticipantsSplitSelector.propTypes = propTypes;
-MoneyRequestParticipantsSplitSelector.defaultProps = defaultProps;
-MoneyRequestParticipantsSplitSelector.displayName = 'MoneyRequestParticipantsSplitSelector';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
-    }),
-)(MoneyRequestParticipantsSplitSelector);
diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js
index 1da13b10dbb4..7159e1d7252f 100644
--- a/src/pages/iou/steps/NewRequestAmountPage.js
+++ b/src/pages/iou/steps/NewRequestAmountPage.js
@@ -15,11 +15,13 @@ import * as IOU from '../../../libs/actions/IOU';
 import useLocalize from '../../../hooks/useLocalize';
 import MoneyRequestAmountForm from './MoneyRequestAmountForm';
 import * as IOUUtils from '../../../libs/IOUUtils';
+import * as MoneyRequestUtils from '../../../libs/MoneyRequestUtils';
 import FullPageNotFoundView from '../../../components/BlockingViews/FullPageNotFoundView';
 import styles from '../../../styles/styles';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
+import CONST from '../../../CONST';
 
 const propTypes = {
     /** React Navigation route */
@@ -42,14 +44,18 @@ const propTypes = {
 
     /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
     iou: iouPropTypes,
+
+    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
+    selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]),
 };
 
 const defaultProps = {
     report: {},
     iou: iouDefaultProps,
+    selectedTab: CONST.TAB.MANUAL,
 };
 
-function NewRequestAmountPage({route, iou, report}) {
+function NewRequestAmountPage({route, iou, report, selectedTab}) {
     const {translate} = useLocalize();
 
     const prevMoneyRequestID = useRef(iou.id);
@@ -59,6 +65,7 @@ function NewRequestAmountPage({route, iou, report}) {
     const reportID = lodashGet(route, 'params.reportID', '');
     const isEditing = lodashGet(route, 'path', '').includes('amount');
     const currentCurrency = lodashGet(route, 'params.currency', '');
+    const isDistanceRequestTab = MoneyRequestUtils.isDistanceRequest(iouType, selectedTab);
 
     const currency = currentCurrency || iou.currency;
 
@@ -92,6 +99,12 @@ function NewRequestAmountPage({route, iou, report}) {
     // Because we use Onyx to store IOU info, when we try to make two different money requests from different tabs,
     // it can result in an IOU sent with improper values. In such cases we want to reset the flow and redirect the user to the first step of the IOU.
     useEffect(() => {
+        const moneyRequestID = `${iouType}${reportID}`;
+        const shouldReset = iou.id !== moneyRequestID;
+        if (shouldReset) {
+            IOU.resetMoneyRequestInfo(moneyRequestID);
+        }
+
         if (isEditing) {
             // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
             if (prevMoneyRequestID.current !== iou.id) {
@@ -102,13 +115,8 @@ function NewRequestAmountPage({route, iou, report}) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
                 return;
             }
-            const moneyRequestID = `${iouType}${reportID}`;
-            const shouldReset = iou.id !== moneyRequestID;
-            if (shouldReset) {
-                IOU.resetMoneyRequestInfo(moneyRequestID);
-            }
 
-            if (_.isEmpty(iou.participants) || iou.amount === 0 || shouldReset) {
+            if (!isDistanceRequestTab && (_.isEmpty(iou.participantAccountIDs) || iou.amount === 0 || shouldReset)) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
             }
         }
@@ -116,13 +124,19 @@ function NewRequestAmountPage({route, iou, report}) {
         return () => {
             prevMoneyRequestID.current = iou.id;
         };
-    }, [iou.participants, iou.amount, iou.id, isEditing, iouType, reportID]);
+    }, [iou.participantAccountIDs, iou.amount, iou.id, isEditing, iouType, reportID, isDistanceRequestTab]);
 
     const navigateBack = () => {
         Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null);
     };
 
     const navigateToCurrencySelectionPage = () => {
+        // If the money request being created is a distance request, don't allow the user to choose the currency.
+        // Only USD is allowed for distance requests.
+        if (isDistanceRequestTab) {
+            return;
+        }
+
         // Remove query from the route and encode it.
         const activeRoute = encodeURIComponent(Navigation.getActiveRoute().replace(/\?.*/, ''));
         Navigation.navigate(ROUTES.getMoneyRequestCurrencyRoute(iouType, reportID, currency, activeRoute));
@@ -169,7 +183,7 @@ function NewRequestAmountPage({route, iou, report}) {
                     <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                         <HeaderWithBackButton
                             title={translate('iou.amount')}
-                            onBackButonBackButtonPress={navigateBack}
+                            onBackButtonPress={navigateBack}
                         />
                         {content}
                     </View>
@@ -188,4 +202,7 @@ export default withOnyx({
     report: {
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(NewRequestAmountPage);
diff --git a/src/pages/settings/Preferences/LanguagePage.js b/src/pages/settings/Preferences/LanguagePage.js
index 0eb93853726a..706fa3b62db6 100644
--- a/src/pages/settings/Preferences/LanguagePage.js
+++ b/src/pages/settings/Preferences/LanguagePage.js
@@ -7,6 +7,7 @@ import withLocalize, {withLocalizePropTypes} from '../../../components/withLocal
 import * as App from '../../../libs/actions/App';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
+import CONST from '../../../CONST';
 import SelectionList from '../../../components/SelectionList';
 
 const propTypes = {
@@ -17,11 +18,11 @@ const propTypes = {
 };
 
 function LanguagePage(props) {
-    const localesToLanguages = _.map(props.translate('languagePage.languages'), (language, key) => ({
-        value: key,
-        text: language.label,
-        keyForList: key,
-        isSelected: props.preferredLocale === key,
+    const localesToLanguages = _.map(CONST.LANGUAGES, (language) => ({
+        value: language,
+        text: props.translate(`languagePage.languages.${language}.label`),
+        keyForList: language,
+        isSelected: props.preferredLocale === language,
     }));
 
     return (
diff --git a/src/pages/settings/Preferences/PreferencesPage.js b/src/pages/settings/Preferences/PreferencesPage.js
index b8bb74295567..9e30e99ff38f 100755
--- a/src/pages/settings/Preferences/PreferencesPage.js
+++ b/src/pages/settings/Preferences/PreferencesPage.js
@@ -40,9 +40,6 @@ function PreferencesPage(props) {
     const {isProduction} = useEnvironment();
     const {translate, preferredLocale} = useLocalize();
 
-    const priorityModes = translate('priorityModePage.priorityModes');
-    const languages = translate('languagePage.languages');
-
     return (
         <IllustratedHeaderPageLayout
             title={translate('common.preferences')}
@@ -71,13 +68,13 @@ function PreferencesPage(props) {
                 </View>
                 <MenuItemWithTopDescription
                     shouldShowRightIcon
-                    title={priorityModes[props.priorityMode].label}
+                    title={translate(`priorityModePage.priorityModes.${props.priorityMode}.label`)}
                     description={translate('priorityModePage.priorityMode')}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_PRIORITY_MODE)}
                 />
                 <MenuItemWithTopDescription
                     shouldShowRightIcon
-                    title={languages[preferredLocale].label}
+                    title={translate(`languagePage.languages.${preferredLocale}.label`)}
                     description={translate('languagePage.language')}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_LANGUAGE)}
                 />
diff --git a/src/pages/settings/Preferences/PriorityModePage.js b/src/pages/settings/Preferences/PriorityModePage.js
index b32987e242de..0c3d28fe9d81 100644
--- a/src/pages/settings/Preferences/PriorityModePage.js
+++ b/src/pages/settings/Preferences/PriorityModePage.js
@@ -26,12 +26,12 @@ const defaultProps = {
 };
 
 function PriorityModePage(props) {
-    const priorityModes = _.map(props.translate('priorityModePage.priorityModes'), (mode, key) => ({
-        value: key,
-        text: mode.label,
-        alternateText: mode.description,
-        keyForList: key,
-        isSelected: props.priorityMode === key,
+    const priorityModes = _.map(_.values(CONST.PRIORITY_MODE), (mode) => ({
+        value: mode,
+        text: props.translate(`priorityModePage.priorityModes.${mode}.label`),
+        alternateText: props.translate(`priorityModePage.priorityModes.${mode}.description`),
+        keyForList: mode,
+        isSelected: props.priorityMode === mode,
     }));
 
     const updateMode = useCallback(
diff --git a/src/pages/settings/Preferences/ThemePage.js b/src/pages/settings/Preferences/ThemePage.js
index a260caa283e3..4e41d5fc7129 100644
--- a/src/pages/settings/Preferences/ThemePage.js
+++ b/src/pages/settings/Preferences/ThemePage.js
@@ -27,11 +27,11 @@ const defaultProps = {
 };
 
 function ThemePage(props) {
-    const localesToThemes = _.map(props.translate('themePage.themes'), (theme, key) => ({
-        value: key,
-        text: theme.label,
-        keyForList: key,
-        isSelected: (props.preferredTheme || CONST.THEME.DEFAULT) === key,
+    const localesToThemes = _.map(_.values(_.omit(CONST.THEME, 'DEFAULT')), (theme) => ({
+        value: theme,
+        text: props.translate(`themePage.themes.${theme}.label`),
+        keyForList: theme,
+        isSelected: (props.preferredTheme || CONST.THEME.DEFAULT) === theme,
     }));
 
     return (
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 7b2cf85ef141..a0091e5c184b 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -19,13 +19,12 @@ import OfflineWithFeedback from '../../../../components/OfflineWithFeedback';
 import DotIndicatorMessage from '../../../../components/DotIndicatorMessage';
 import ConfirmModal from '../../../../components/ConfirmModal';
 import * as User from '../../../../libs/actions/User';
-import CONST from '../../../../CONST';
 import * as ErrorUtils from '../../../../libs/ErrorUtils';
 import themeColors from '../../../../styles/themes/default';
-import NotFoundPage from '../../../ErrorPage/NotFoundPage';
 import ValidateCodeForm from './ValidateCodeForm';
 import ROUTES from '../../../../ROUTES';
 import FullscreenLoadingIndicator from '../../../../components/FullscreenLoadingIndicator';
+import FullPageNotFoundView from '../../../../components/BlockingViews/FullPageNotFoundView';
 
 const propTypes = {
     /* Onyx Props */
@@ -108,16 +107,21 @@ class ContactMethodDetailsPage extends Component {
     }
 
     componentDidMount() {
+        const contactMethod = this.getContactMethod();
+        const loginData = lodashGet(this.props.loginList, contactMethod, {});
+        if (_.isEmpty(loginData)) {
+            return;
+        }
         User.resetContactMethodValidateCodeSentState(this.getContactMethod());
     }
 
     componentDidUpdate(prevProps) {
-        const errorFields = lodashGet(this.props.loginList, [this.getContactMethod(), 'errorFields'], {});
-        const prevPendingFields = lodashGet(prevProps.loginList, [this.getContactMethod(), 'pendingFields'], {});
+        const validatedDate = lodashGet(this.props.loginList, [this.getContactMethod(), 'validatedDate']);
+        const prevValidatedDate = lodashGet(prevProps.loginList, [this.getContactMethod(), 'validatedDate']);
 
         // Navigate to methods page on successful magic code verification
-        // validateLogin property of errorFields & prev pendingFields is responsible to decide the status of the magic code verification
-        if (!errorFields.validateLogin && prevPendingFields.validateLogin === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE) {
+        // validatedDate property is responsible to decide the status of the magic code verification
+        if (!prevValidatedDate && validatedDate) {
             Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS);
         }
     }
@@ -211,7 +215,16 @@ class ContactMethodDetailsPage extends Component {
 
         const loginData = this.props.loginList[contactMethod];
         if (!contactMethod || !loginData) {
-            return <NotFoundPage />;
+            return (
+                <ScreenWrapper>
+                    <FullPageNotFoundView
+                        shouldShow
+                        linkKey="contacts.goBackContactMethods"
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS)}
+                        onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS)}
+                    />
+                </ScreenWrapper>
+            );
         }
 
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 973a0475846d..bcea33d9c366 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -76,6 +76,7 @@ function BaseValidateCodeForm(props) {
     const loginData = props.loginList[props.contactMethod];
     const inputValidateCodeRef = useRef();
     const validateLoginError = ErrorUtils.getEarliestErrorField(loginData, 'validateLogin');
+    const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
 
     useImperativeHandle(props.innerRef, () => ({
         focus() {
@@ -170,7 +171,7 @@ function BaseValidateCodeForm(props) {
             >
                 <View style={[styles.mt2, styles.dFlex, styles.flexColumn, styles.alignItemsStart]}>
                     <PressableWithFeedback
-                        disabled={props.network.isOffline}
+                        disabled={shouldDisableResendValidateCode}
                         style={[styles.mr1]}
                         onPress={resendValidateCode}
                         underlayColor={themeColors.componentBG}
@@ -179,7 +180,7 @@ function BaseValidateCodeForm(props) {
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         accessibilityLabel={props.translate('validateCodeForm.magicCodeNotReceived')}
                     >
-                        <Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>{props.translate('validateCodeForm.magicCodeNotReceived')}</Text>
+                        <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>{props.translate('validateCodeForm.magicCodeNotReceived')}</Text>
                     </PressableWithFeedback>
                     {props.hasMagicCodeBeenSent && (
                         <DotIndicatorMessage
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 0d7e1c09454d..f178b25fd0fb 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -68,7 +68,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
         <StaticHeaderPageLayout
             title={localize.translate('statusPage.status')}
             onBackButtonPress={navigateBackToSettingsPage}
-            backgroundColor={themeColors.midtone}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.SETTINGS_STATUS]}
             image={MobileBackgroundImage}
             footer={footerComponent}
         >
diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js
index 36bb692598fc..ce047bd9ccae 100644
--- a/src/pages/settings/Profile/LoungeAccessPage.js
+++ b/src/pages/settings/Profile/LoungeAccessPage.js
@@ -1,5 +1,7 @@
 import React from 'react';
+import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import * as Illustrations from '../../../components/Icon/Illustrations';
@@ -10,14 +12,34 @@ import useLocalize from '../../../hooks/useLocalize';
 import FeatureList from '../../../components/FeatureList';
 import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPageLayout';
 import * as LottieAnimations from '../../../components/LottieAnimations';
+import compose from '../../../libs/compose';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
+import LinearGradient from '../../../components/LinearGradient';
+import styles from '../../../styles/styles';
+import Avatar from '../../../components/Avatar';
+import Text from '../../../components/Text';
+import * as UserUtils from '../../../libs/UserUtils';
+import CONST from '../../../CONST';
+import themeColors from '../../../styles/themes/default';
+import * as LocalePhoneNumber from '../../../libs/LocalePhoneNumber';
 
 const propTypes = {
+    /** The session of the logged in person */
+    session: PropTypes.shape({
+        /** Email of the logged in person */
+        email: PropTypes.string,
+    }),
+
     /** Current user details, which will hold whether or not they have Lounge Access */
     user: userPropTypes,
+
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
+    session: {},
     user: {},
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 const menuItems = [
@@ -35,18 +57,46 @@ const menuItems = [
     },
 ];
 
-function LoungeAccessPage({user}) {
+function LoungeAccessPage(props) {
     const {translate} = useLocalize();
 
-    if (!user.hasLoungeAccess) {
+    if (!props.user.hasLoungeAccess) {
         return <NotFoundPage />;
     }
 
+    const overlayContent = () => (
+        <LinearGradient
+            colors={[`${themeColors.dark}00`, themeColors.dark]}
+            style={[styles.pAbsolute, styles.w100, styles.h100]}
+        >
+            <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.pt5]}>
+                <Avatar
+                    imageStyles={[styles.avatarLarge]}
+                    source={UserUtils.getAvatar(props.currentUserPersonalDetails.avatar, props.session.accountID)}
+                    size={CONST.AVATAR_SIZE.LARGE}
+                />
+                <Text
+                    style={[styles.textHeadline, styles.pre, styles.mt2]}
+                    numberOfLines={1}
+                >
+                    {props.currentUserPersonalDetails.displayName ? props.currentUserPersonalDetails.displayName : LocalePhoneNumber.formatPhoneNumber(props.session.email)}
+                </Text>
+                <Text
+                    style={[styles.textLabelSupporting, styles.mt1]}
+                    numberOfLines={1}
+                >
+                    {LocalePhoneNumber.formatPhoneNumber(props.session.email)}
+                </Text>
+            </View>
+        </LinearGradient>
+    );
+
     return (
         <IllustratedHeaderPageLayout
             title={translate('loungeAccessPage.loungeAccess')}
             onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
             illustration={LottieAnimations.ExpensifyLounge}
+            overlayContent={overlayContent}
         >
             <FeatureList
                 headline="loungeAccessPage.headline"
@@ -61,8 +111,14 @@ LoungeAccessPage.propTypes = propTypes;
 LoungeAccessPage.defaultProps = defaultProps;
 LoungeAccessPage.displayName = 'LoungeAccessPage';
 
-export default withOnyx({
-    user: {
-        key: ONYXKEYS.USER,
-    },
-})(LoungeAccessPage);
+export default compose(
+    withCurrentUserPersonalDetails,
+    withOnyx({
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        user: {
+            key: ONYXKEYS.USER,
+        },
+    }),
+)(LoungeAccessPage);
diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.js b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
index 814d47e003b7..886e207bf68a 100644
--- a/src/pages/settings/Profile/PersonalDetails/AddressPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
@@ -26,9 +26,6 @@ import FullscreenLoadingIndicator from '../../../../components/FullscreenLoading
 const propTypes = {
     /* Onyx Props */
 
-    // The user's country based on IP address
-    country: PropTypes.string,
-
     /** User's private personal details */
     privatePersonalDetails: PropTypes.shape({
         /** User's home address */
@@ -43,7 +40,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    country: '',
     privatePersonalDetails: {
         address: {
             street: '',
@@ -63,15 +59,16 @@ function updateAddress(values) {
     PersonalDetails.updateAddress(values.addressLine1.trim(), values.addressLine2.trim(), values.city.trim(), values.state.trim(), values.zipPostCode.trim().toUpperCase(), values.country);
 }
 
-function AddressPage({privatePersonalDetails, country}) {
+function AddressPage({privatePersonalDetails}) {
     usePrivatePersonalDetails();
     const {translate} = useLocalize();
-    const [currentCountry, setCurrentCountry] = useState(PersonalDetails.getCountryISO(lodashGet(privatePersonalDetails, 'address.country')) || country || CONST.COUNTRY.US);
+    const [currentCountry, setCurrentCountry] = useState(PersonalDetails.getCountryISO(lodashGet(privatePersonalDetails, 'address.country')));
     const isUSAForm = currentCountry === CONST.COUNTRY.US;
     const zipSampleFormat = lodashGet(CONST.COUNTRY_ZIP_REGEX_DATA, [currentCountry, 'samples'], '');
     const zipFormat = translate('common.zipCodeExampleFormat', {zipSampleFormat});
 
     const address = lodashGet(privatePersonalDetails, 'address') || {};
+    const isLoadingPersonalDetails = lodashGet(privatePersonalDetails, 'isLoading', true);
     const [street1, street2] = (address.street || '').split('\n');
     const [state, setState] = useState(address.state);
     /**
@@ -131,10 +128,6 @@ function AddressPage({privatePersonalDetails, country}) {
         setState(value);
     };
 
-    if (lodashGet(privatePersonalDetails, 'isLoading', true)) {
-        return <FullscreenLoadingIndicator />;
-    }
-
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
@@ -142,92 +135,96 @@ function AddressPage({privatePersonalDetails, country}) {
                 shouldShowBackButton
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PERSONAL_DETAILS)}
             />
-            <Form
-                style={[styles.flexGrow1, styles.mh5]}
-                formID={ONYXKEYS.FORMS.HOME_ADDRESS_FORM}
-                validate={validate}
-                onSubmit={updateAddress}
-                submitButtonText={translate('common.save')}
-                enabledWhenOffline
-            >
-                <View>
-                    <AddressSearch
-                        inputID="addressLine1"
-                        label={translate('common.addressLine', {lineNumber: 1})}
-                        defaultValue={street1 || ''}
-                        onValueChange={handleAddressChange}
-                        renamedInputKeys={{
-                            street: 'addressLine1',
-                            street2: 'addressLine2',
-                            city: 'city',
-                            state: 'state',
-                            zipCode: 'zipPostCode',
-                            country: 'country',
-                        }}
-                        maxInputLength={CONST.FORM_CHARACTER_LIMIT}
-                    />
-                </View>
-                <View style={styles.formSpaceVertical} />
-                <TextInput
-                    inputID="addressLine2"
-                    label={translate('common.addressLine', {lineNumber: 2})}
-                    accessibilityLabel={translate('common.addressLine')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    defaultValue={street2 || ''}
-                    maxLength={CONST.FORM_CHARACTER_LIMIT}
-                    spellCheck={false}
-                />
-                <View style={styles.formSpaceVertical} />
-                <View style={styles.mhn5}>
-                    <CountryPicker
-                        inputID="country"
-                        defaultValue={currentCountry}
-                        onValueChange={handleAddressChange}
+            {isLoadingPersonalDetails ? (
+                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            ) : (
+                <Form
+                    style={[styles.flexGrow1, styles.mh5]}
+                    formID={ONYXKEYS.FORMS.HOME_ADDRESS_FORM}
+                    validate={validate}
+                    onSubmit={updateAddress}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <View>
+                        <AddressSearch
+                            inputID="addressLine1"
+                            label={translate('common.addressLine', {lineNumber: 1})}
+                            defaultValue={street1 || ''}
+                            onValueChange={handleAddressChange}
+                            renamedInputKeys={{
+                                street: 'addressLine1',
+                                street2: 'addressLine2',
+                                city: 'city',
+                                state: 'state',
+                                zipCode: 'zipPostCode',
+                                country: 'country',
+                            }}
+                            maxInputLength={CONST.FORM_CHARACTER_LIMIT}
+                        />
+                    </View>
+                    <View style={styles.formSpaceVertical} />
+                    <TextInput
+                        inputID="addressLine2"
+                        label={translate('common.addressLine', {lineNumber: 2})}
+                        accessibilityLabel={translate('common.addressLine')}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                        defaultValue={street2 || ''}
+                        maxLength={CONST.FORM_CHARACTER_LIMIT}
+                        spellCheck={false}
                     />
-                </View>
-                <View style={styles.formSpaceVertical} />
-                {isUSAForm ? (
+                    <View style={styles.formSpaceVertical} />
                     <View style={styles.mhn5}>
-                        <StatePicker
-                            inputID="state"
-                            defaultValue={state}
+                        <CountryPicker
+                            inputID="country"
+                            defaultValue={currentCountry}
                             onValueChange={handleAddressChange}
                         />
                     </View>
-                ) : (
+                    <View style={styles.formSpaceVertical} />
+                    {isUSAForm ? (
+                        <View style={styles.mhn5}>
+                            <StatePicker
+                                inputID="state"
+                                defaultValue={state}
+                                onValueChange={handleAddressChange}
+                            />
+                        </View>
+                    ) : (
+                        <TextInput
+                            inputID="state"
+                            label={translate('common.stateOrProvince')}
+                            accessibilityLabel={translate('common.stateOrProvince')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            value={state || ''}
+                            maxLength={CONST.FORM_CHARACTER_LIMIT}
+                            spellCheck={false}
+                            onValueChange={handleAddressChange}
+                        />
+                    )}
+                    <View style={styles.formSpaceVertical} />
                     <TextInput
-                        inputID="state"
-                        label={translate('common.stateOrProvince')}
-                        accessibilityLabel={translate('common.stateOrProvince')}
+                        inputID="city"
+                        label={translate('common.city')}
+                        accessibilityLabel={translate('common.city')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        value={state || ''}
+                        defaultValue={address.city || ''}
                         maxLength={CONST.FORM_CHARACTER_LIMIT}
                         spellCheck={false}
-                        onValueChange={handleAddressChange}
                     />
-                )}
-                <View style={styles.formSpaceVertical} />
-                <TextInput
-                    inputID="city"
-                    label={translate('common.city')}
-                    accessibilityLabel={translate('common.city')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    defaultValue={address.city || ''}
-                    maxLength={CONST.FORM_CHARACTER_LIMIT}
-                    spellCheck={false}
-                />
-                <View style={styles.formSpaceVertical} />
-                <TextInput
-                    inputID="zipPostCode"
-                    label={translate('common.zipPostCode')}
-                    accessibilityLabel={translate('common.zipPostCode')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    autoCapitalize="characters"
-                    defaultValue={address.zip || ''}
-                    maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
-                    hint={zipFormat}
-                />
-            </Form>
+                    <View style={styles.formSpaceVertical} />
+                    <TextInput
+                        inputID="zipPostCode"
+                        label={translate('common.zipPostCode')}
+                        accessibilityLabel={translate('common.zipPostCode')}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                        autoCapitalize="characters"
+                        defaultValue={address.zip || ''}
+                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
+                        hint={zipFormat}
+                    />
+                </Form>
+            )}
         </ScreenWrapper>
     );
 }
@@ -236,9 +233,6 @@ AddressPage.propTypes = propTypes;
 AddressPage.defaultProps = defaultProps;
 
 export default withOnyx({
-    country: {
-        key: ONYXKEYS.COUNTRY,
-    },
     privatePersonalDetails: {
         key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
     },
diff --git a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
index 90c469c4e25d..22346a48658d 100644
--- a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
@@ -38,6 +38,7 @@ const defaultProps = {
 
 function DateOfBirthPage({translate, privatePersonalDetails}) {
     usePrivatePersonalDetails();
+    const isLoadingPersonalDetails = lodashGet(privatePersonalDetails, 'isLoading', true);
 
     /**
      * @param {Object} values
@@ -59,32 +60,32 @@ function DateOfBirthPage({translate, privatePersonalDetails}) {
         return errors;
     }, []);
 
-    if (lodashGet(privatePersonalDetails, 'isLoading', true)) {
-        return <FullscreenLoadingIndicator />;
-    }
-
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
                 title={translate('common.dob')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PERSONAL_DETAILS)}
             />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.DATE_OF_BIRTH_FORM}
-                validate={validate}
-                onSubmit={PersonalDetails.updateDateOfBirth}
-                submitButtonText={translate('common.save')}
-                enabledWhenOffline
-            >
-                <NewDatePicker
-                    inputID="dob"
-                    label={translate('common.date')}
-                    defaultValue={privatePersonalDetails.dob || ''}
-                    minDate={moment().subtract(CONST.DATE_BIRTH.MAX_AGE, 'years').toDate()}
-                    maxDate={moment().subtract(CONST.DATE_BIRTH.MIN_AGE, 'years').toDate()}
-                />
-            </Form>
+            {isLoadingPersonalDetails ? (
+                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            ) : (
+                <Form
+                    style={[styles.flexGrow1, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.DATE_OF_BIRTH_FORM}
+                    validate={validate}
+                    onSubmit={PersonalDetails.updateDateOfBirth}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <NewDatePicker
+                        inputID="dob"
+                        label={translate('common.date')}
+                        defaultValue={privatePersonalDetails.dob || ''}
+                        minDate={moment().subtract(CONST.DATE_BIRTH.MAX_AGE, 'years').toDate()}
+                        maxDate={moment().subtract(CONST.DATE_BIRTH.MIN_AGE, 'years').toDate()}
+                    />
+                </Form>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
index 031816247317..0caf20a3e128 100644
--- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
+++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
@@ -47,6 +47,7 @@ function LegalNamePage(props) {
     usePrivatePersonalDetails();
     const legalFirstName = lodashGet(props.privatePersonalDetails, 'legalFirstName', '');
     const legalLastName = lodashGet(props.privatePersonalDetails, 'legalLastName', '');
+    const isLoadingPersonalDetails = lodashGet(props.privatePersonalDetails, 'isLoading', true);
 
     const validate = useCallback((values) => {
         const errors = {};
@@ -66,10 +67,6 @@ function LegalNamePage(props) {
         return errors;
     }, []);
 
-    if (lodashGet(props.privatePersonalDetails, 'isLoading', true)) {
-        return <FullscreenLoadingIndicator />;
-    }
-
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -79,39 +76,43 @@ function LegalNamePage(props) {
                 title={props.translate('privatePersonalDetails.legalName')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PERSONAL_DETAILS)}
             />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.LEGAL_NAME_FORM}
-                validate={validate}
-                onSubmit={updateLegalName}
-                submitButtonText={props.translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={[styles.mb4]}>
-                    <TextInput
-                        inputID="legalFirstName"
-                        name="lfname"
-                        label={props.translate('privatePersonalDetails.legalFirstName')}
-                        accessibilityLabel={props.translate('privatePersonalDetails.legalFirstName')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        defaultValue={legalFirstName}
-                        maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
-                        spellCheck={false}
-                    />
-                </View>
-                <View>
-                    <TextInput
-                        inputID="legalLastName"
-                        name="llname"
-                        label={props.translate('privatePersonalDetails.legalLastName')}
-                        accessibilityLabel={props.translate('privatePersonalDetails.legalLastName')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        defaultValue={legalLastName}
-                        maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
-                        spellCheck={false}
-                    />
-                </View>
-            </Form>
+            {isLoadingPersonalDetails ? (
+                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            ) : (
+                <Form
+                    style={[styles.flexGrow1, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.LEGAL_NAME_FORM}
+                    validate={validate}
+                    onSubmit={updateLegalName}
+                    submitButtonText={props.translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <View style={[styles.mb4]}>
+                        <TextInput
+                            inputID="legalFirstName"
+                            name="lfname"
+                            label={props.translate('privatePersonalDetails.legalFirstName')}
+                            accessibilityLabel={props.translate('privatePersonalDetails.legalFirstName')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            defaultValue={legalFirstName}
+                            maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
+                            spellCheck={false}
+                        />
+                    </View>
+                    <View>
+                        <TextInput
+                            inputID="legalLastName"
+                            name="llname"
+                            label={props.translate('privatePersonalDetails.legalLastName')}
+                            accessibilityLabel={props.translate('privatePersonalDetails.legalLastName')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            defaultValue={legalLastName}
+                            maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
+                            spellCheck={false}
+                        />
+                    </View>
+                </Form>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
index e22aeca6a3d8..e1c4f14047a2 100644
--- a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
@@ -60,6 +60,7 @@ function PersonalDetailsInitialPage(props) {
     const privateDetails = props.privatePersonalDetails || {};
     const address = privateDetails.address || {};
     const legalName = `${privateDetails.legalFirstName || ''} ${privateDetails.legalLastName || ''}`.trim();
+    const isLoadingPersonalDetails = lodashGet(props.privatePersonalDetails, 'isLoading', true);
 
     /**
      * Applies common formatting to each piece of an address
@@ -83,42 +84,42 @@ function PersonalDetailsInitialPage(props) {
         return formattedAddress.trim().replace(/,$/, '');
     };
 
-    if (lodashGet(props.privatePersonalDetails, 'isLoading', true)) {
-        return <FullscreenLoadingIndicator />;
-    }
-
     return (
         <ScreenWrapper>
             <HeaderWithBackButton
                 title={props.translate('privatePersonalDetails.personalDetails')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
             />
-            <ScrollView>
-                <View style={styles.flex1}>
-                    <View style={[styles.ph5, styles.mb5]}>
-                        <Text>{props.translate('privatePersonalDetails.privateDataMessage')}</Text>
+            {isLoadingPersonalDetails ? (
+                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            ) : (
+                <ScrollView>
+                    <View style={styles.flex1}>
+                        <View style={[styles.ph5, styles.mb5]}>
+                            <Text>{props.translate('privatePersonalDetails.privateDataMessage')}</Text>
+                        </View>
+                        <MenuItemWithTopDescription
+                            title={legalName}
+                            description={props.translate('privatePersonalDetails.legalName')}
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_LEGAL_NAME)}
+                        />
+                        <MenuItemWithTopDescription
+                            title={privateDetails.dob || ''}
+                            description={props.translate('common.dob')}
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH)}
+                            titleStyle={[styles.flex1]}
+                        />
+                        <MenuItemWithTopDescription
+                            title={getFormattedAddress()}
+                            description={props.translate('privatePersonalDetails.homeAddress')}
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS)}
+                        />
                     </View>
-                    <MenuItemWithTopDescription
-                        title={legalName}
-                        description={props.translate('privatePersonalDetails.legalName')}
-                        shouldShowRightIcon
-                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_LEGAL_NAME)}
-                    />
-                    <MenuItemWithTopDescription
-                        title={privateDetails.dob || ''}
-                        description={props.translate('common.dob')}
-                        shouldShowRightIcon
-                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH)}
-                        titleStyle={[styles.flex1]}
-                    />
-                    <MenuItemWithTopDescription
-                        title={getFormattedAddress()}
-                        description={props.translate('privatePersonalDetails.homeAddress')}
-                        shouldShowRightIcon
-                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS)}
-                    />
-                </View>
-            </ScrollView>
+                </ScrollView>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index 1f89756353ff..1864ba60524c 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -57,10 +57,16 @@ function ProfilePage(props) {
         if (pronounsKey.startsWith(CONST.PRONOUNS.PREFIX)) {
             pronounsKey = pronounsKey.slice(CONST.PRONOUNS.PREFIX.length);
         }
-        return lodashGet(props.translate('pronouns'), pronounsKey, props.translate('profilePage.selectYourPronouns'));
+
+        if (!pronounsKey) {
+            return props.translate('profilePage.selectYourPronouns');
+        }
+        return props.translate(`pronouns.${pronounsKey}`);
     };
     const currentUserDetails = props.currentUserPersonalDetails || {};
     const contactMethodBrickRoadIndicator = UserUtils.getLoginListBrickRoadIndicator(props.loginList);
+    const avatarURL = lodashGet(currentUserDetails, 'avatar', '');
+    const accountID = lodashGet(currentUserDetails, 'accountID', '');
     const emojiCode = lodashGet(props, 'currentUserPersonalDetails.status.emojiCode', '');
 
     const profileSettingsOptions = [
@@ -109,7 +115,7 @@ function ProfilePage(props) {
             <ScrollView>
                 <AvatarWithImagePicker
                     isUsingDefaultAvatar={UserUtils.isDefaultAvatar(lodashGet(currentUserDetails, 'avatar', ''))}
-                    source={UserUtils.getAvatar(lodashGet(currentUserDetails, 'avatar', ''), lodashGet(currentUserDetails, 'accountID', ''))}
+                    source={UserUtils.getAvatar(avatarURL, accountID)}
                     onImageSelected={PersonalDetails.updateAvatar}
                     onImageRemoved={PersonalDetails.deleteAvatar}
                     anchorPosition={styles.createMenuPositionProfile(props.windowWidth)}
@@ -119,6 +125,9 @@ function ProfilePage(props) {
                     errors={lodashGet(props.currentUserPersonalDetails, 'errorFields.avatar', null)}
                     errorRowStyles={[styles.mt6]}
                     onErrorClose={PersonalDetails.clearAvatarErrors}
+                    previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
+                    originalFileName={currentUserDetails.originalFileName}
+                    headerTitle={props.translate('profilePage.profileAvatar')}
                     style={[styles.mh5]}
                 />
                 <View style={[styles.mt4]}>
diff --git a/src/pages/settings/Profile/PronounsPage.js b/src/pages/settings/Profile/PronounsPage.js
index ce460bc30ff4..5f8824046d69 100644
--- a/src/pages/settings/Profile/PronounsPage.js
+++ b/src/pages/settings/Profile/PronounsPage.js
@@ -1,21 +1,19 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import React, {useState, useEffect, useCallback} from 'react';
+import React, {useState, useMemo} from 'react';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
-import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import Text from '../../../components/Text';
 import styles from '../../../styles/styles';
 import * as PersonalDetails from '../../../libs/actions/PersonalDetails';
-import compose from '../../../libs/compose';
 import CONST from '../../../CONST';
 import ROUTES from '../../../ROUTES';
 import Navigation from '../../../libs/Navigation/Navigation';
 import SelectionList from '../../../components/SelectionList';
+import useLocalize from '../../../hooks/useLocalize';
 
 const propTypes = {
-    ...withLocalizePropTypes,
     ...withCurrentUserPersonalDetailsPropTypes,
 };
 
@@ -23,95 +21,66 @@ const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
-function PronounsPage(props) {
-    const [initiallyFocusedOption, setInitiallyFocusedOption] = useState({});
-    const [searchValue, setSearchValue] = useState('');
-    const [pronounsList, setPronounsList] = useState([]);
+function PronounsPage({currentUserPersonalDetails}) {
+    const {translate} = useLocalize();
+    const currentPronouns = lodashGet(currentUserPersonalDetails, 'pronouns', '');
+    const currentPronounsKey = currentPronouns.substring(CONST.PRONOUNS.PREFIX.length);
 
-    /**
-     * Loads the pronouns list from the translations and adds the green checkmark icon to the currently selected value.
-     *
-     * @returns {void}
-     */
-    const loadPronouns = useCallback(() => {
-        const currentPronouns = lodashGet(props.currentUserPersonalDetails, 'pronouns', '');
+    const [searchValue, setSearchValue] = useState(() => {
+        const currentPronounsText = _.chain(CONST.PRONOUNS_LIST)
+            .find((_value) => _value === currentPronounsKey)
+            .value();
 
-        const pronouns = _.chain(props.translate('pronouns'))
-            .map((value, key) => {
-                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${key}`;
-                const isCurrentPronouns = fullPronounKey === currentPronouns;
+        return currentPronounsText ? translate(`pronouns.${currentPronounsText}`) : '';
+    });
 
-                if (isCurrentPronouns) {
-                    setInitiallyFocusedOption({
-                        text: value,
-                        keyForList: key,
-                    });
-                }
+    const filteredPronounsList = useMemo(() => {
+        const pronouns = _.chain(CONST.PRONOUNS_LIST)
+            .map((value) => {
+                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${value}`;
+                const isCurrentPronouns = fullPronounKey === currentPronouns;
 
                 return {
-                    text: value,
+                    text: translate(`pronouns.${value}`),
                     value: fullPronounKey,
-                    keyForList: key,
+                    keyForList: value,
                     isSelected: isCurrentPronouns,
                 };
             })
             .sortBy((pronoun) => pronoun.text.toLowerCase())
             .value();
 
-        setPronounsList(pronouns);
+        const trimmedSearch = searchValue.trim();
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.currentUserPersonalDetails.pronouns]);
+        if (trimmedSearch.length === 0) {
+            return [];
+        }
+        return _.filter(pronouns, (pronoun) => pronoun.text.toLowerCase().indexOf(trimmedSearch.toLowerCase()) >= 0);
+    }, [searchValue, currentPronouns, translate]);
 
-    const onChangeText = (value = '') => {
-        setSearchValue(value);
-    };
+    const headerMessage = searchValue.trim() && filteredPronounsList.length === 0 ? translate('common.noResultsFound') : '';
 
-    /**
-     * @param {Object} selectedPronouns
-     */
     const updatePronouns = (selectedPronouns) => {
-        PersonalDetails.updatePronouns(selectedPronouns.keyForList === initiallyFocusedOption.keyForList ? '' : lodashGet(selectedPronouns, 'value', ''));
+        PersonalDetails.updatePronouns(selectedPronouns.keyForList === currentPronounsKey ? '' : lodashGet(selectedPronouns, 'value', ''));
     };
 
-    /**
-     * Pronouns list filtered by searchValue needed for the OptionsSelector.
-     * Empty array if the searchValue is empty.
-     */
-    const filteredPronounsList = _.filter(pronounsList, (pronous) => pronous.text.toLowerCase().indexOf(searchValue.trim().toLowerCase()) >= 0);
-
-    const headerMessage = searchValue.trim() && !filteredPronounsList.length ? props.translate('common.noResultsFound') : '';
-
-    useEffect(() => {
-        setSearchValue(initiallyFocusedOption.text);
-    }, [initiallyFocusedOption]);
-
-    useEffect(() => {
-        onChangeText();
-        loadPronouns();
-    }, [loadPronouns]);
-
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
-                title={props.translate('pronounsPage.pronouns')}
+                title={translate('pronounsPage.pronouns')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
             />
-            <Text style={[styles.ph5, styles.mb3]}>{props.translate('pronounsPage.isShownOnProfile')}</Text>
-            {/* Only render pronouns if list was loaded (not filtered list), otherwise initially focused item will be empty */}
-            {pronounsList.length > 0 && (
-                <SelectionList
-                    headerMessage={headerMessage}
-                    textInputLabel={props.translate('pronounsPage.pronouns')}
-                    textInputPlaceholder={props.translate('pronounsPage.placeholderText')}
-                    textInputValue={searchValue}
-                    sections={[{data: filteredPronounsList, indexOffset: 0}]}
-                    onSelectRow={updatePronouns}
-                    onChangeText={onChangeText}
-                    initiallyFocusedOptionKey={initiallyFocusedOption.keyForList}
-                    shouldDelayFocus
-                />
-            )}
+            <Text style={[styles.ph5, styles.mb3]}>{translate('pronounsPage.isShownOnProfile')}</Text>
+            <SelectionList
+                headerMessage={headerMessage}
+                textInputLabel={translate('pronounsPage.pronouns')}
+                textInputPlaceholder={translate('pronounsPage.placeholderText')}
+                textInputValue={searchValue}
+                sections={[{data: filteredPronounsList, indexOffset: 0}]}
+                onSelectRow={updatePronouns}
+                onChangeText={setSearchValue}
+                initiallyFocusedOptionKey={currentPronounsKey}
+            />
         </ScreenWrapper>
     );
 }
@@ -120,4 +89,4 @@ PronounsPage.propTypes = propTypes;
 PronounsPage.defaultProps = defaultProps;
 PronounsPage.displayName = 'PronounsPage';
 
-export default compose(withLocalize, withCurrentUserPersonalDetails)(PronounsPage);
+export default withCurrentUserPersonalDetails(PronounsPage);
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js
index 7dfc9fb6f9de..94cb40a3f6f3 100644
--- a/src/pages/settings/Profile/TimezoneInitialPage.js
+++ b/src/pages/settings/Profile/TimezoneInitialPage.js
@@ -1,7 +1,6 @@
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
-import moment from 'moment-timezone';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
@@ -37,7 +36,7 @@ function TimezoneInitialPage(props) {
     const updateAutomaticTimezone = (isAutomatic) => {
         PersonalDetails.updateAutomaticTimezone({
             automatic: isAutomatic,
-            selected: isAutomatic ? moment.tz.guess() : timezone.selected,
+            selected: isAutomatic ? Intl.DateTimeFormat().resolvedOptions().timeZone : timezone.selected,
         });
     };
 
diff --git a/src/pages/settings/Profile/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js
index 718b2bd91290..228bae5cbb6b 100644
--- a/src/pages/settings/Profile/TimezoneSelectPage.js
+++ b/src/pages/settings/Profile/TimezoneSelectPage.js
@@ -46,7 +46,7 @@ function TimezoneSelectPage(props) {
             }))
             .value(),
     );
-    const [timezoneInputText, setTimezoneInputText] = useState(timezone.selected);
+    const [timezoneInputText, setTimezoneInputText] = useState('');
     const [timezoneOptions, setTimezoneOptions] = useState(allTimezones.current);
 
     /**
@@ -84,13 +84,13 @@ function TimezoneSelectPage(props) {
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_TIMEZONE)}
             />
             <SelectionList
+                headerMessage={timezoneInputText.trim() && !timezoneOptions.length ? translate('common.noResultsFound') : ''}
                 textInputLabel={translate('timezonePage.timezone')}
                 textInputValue={timezoneInputText}
                 onChangeText={filterShownTimezones}
                 onSelectRow={saveSelectedTimezone}
                 sections={[{data: timezoneOptions, indexOffset: 0, isDisabled: timezone.automatic}]}
                 initiallyFocusedOptionKey={_.get(_.filter(timezoneOptions, (tz) => tz.text === timezone.selected)[0], 'keyForList')}
-                shouldDelayFocus
                 showScrollIndicator
             />
         </ScreenWrapper>
diff --git a/src/pages/settings/Report/NotificationPreferencePage.js b/src/pages/settings/Report/NotificationPreferencePage.js
index 9765cf1ae0b4..17bd77a235ce 100644
--- a/src/pages/settings/Report/NotificationPreferencePage.js
+++ b/src/pages/settings/Report/NotificationPreferencePage.js
@@ -11,6 +11,7 @@ import withReportOrNotFound from '../../home/report/withReportOrNotFound';
 import FullPageNotFoundView from '../../../components/BlockingViews/FullPageNotFoundView';
 import reportPropTypes from '../../reportPropTypes';
 import ROUTES from '../../../ROUTES';
+import CONST from '../../../CONST';
 import * as Report from '../../../libs/actions/Report';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -26,17 +27,20 @@ const greenCheckmark = {src: Expensicons.Checkmark, color: themeColors.success};
 
 function NotificationPreferencePage(props) {
     const shouldDisableNotificationPreferences = ReportUtils.shouldDisableSettings(props.report) || ReportUtils.isArchivedRoom(props.report);
-    const notificationPreferenceOptions = _.map(props.translate('notificationPreferencesPage.notificationPreferences'), (preference, key) => ({
-        value: key,
-        text: preference,
-        keyForList: key,
+    const notificationPreferenceOptions = _.map(
+        _.filter(_.values(CONST.REPORT.NOTIFICATION_PREFERENCE), (pref) => pref !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN),
+        (preference) => ({
+            value: preference,
+            text: props.translate(`notificationPreferencesPage.notificationPreferences.${preference}`),
+            keyForList: preference,
 
-        // Include the green checkmark icon to indicate the currently selected value
-        customIcon: key === props.report.notificationPreference ? greenCheckmark : null,
+            // Include the green checkmark icon to indicate the currently selected value
+            customIcon: preference === props.report.notificationPreference ? greenCheckmark : null,
 
-        // This property will make the currently selected value have bold text
-        boldStyle: key === props.report.notificationPreference,
-    }));
+            // This property will make the currently selected value have bold text
+            boldStyle: preference === props.report.notificationPreference,
+        }),
+    );
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
diff --git a/src/pages/settings/Security/SecuritySettingsPage.js b/src/pages/settings/Security/SecuritySettingsPage.js
index 90b006669527..7f08247557f4 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.js
+++ b/src/pages/settings/Security/SecuritySettingsPage.js
@@ -3,16 +3,17 @@ import React from 'react';
 import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import styles from '../../../styles/styles';
 import * as Expensicons from '../../../components/Icon/Expensicons';
-import ScreenWrapper from '../../../components/ScreenWrapper';
+import themeColors from '../../../styles/themes/default';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import MenuItem from '../../../components/MenuItem';
 import compose from '../../../libs/compose';
 import ONYXKEYS from '../../../ONYXKEYS';
+import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPageLayout';
+import * as LottieAnimations from '../../../components/LottieAnimations';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -47,11 +48,14 @@ function SecuritySettingsPage(props) {
     ];
 
     return (
-        <ScreenWrapper>
-            <HeaderWithBackButton
-                title={props.translate('initialSettingsPage.security')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
-            />
+        <IllustratedHeaderPageLayout
+            title={props.translate('initialSettingsPage.security')}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
+            shouldShowBackButton
+            shouldShowCloseButton
+            illustration={LottieAnimations.Safe}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.SETTINGS_SECURITY]}
+        >
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexColumn, styles.justifyContentBetween]}>
                 <View style={[styles.flex1]}>
                     {_.map(menuItems, (item) => (
@@ -66,7 +70,7 @@ function SecuritySettingsPage(props) {
                     ))}
                 </View>
             </ScrollView>
-        </ScreenWrapper>
+        </IllustratedHeaderPageLayout>
     );
 }
 
diff --git a/src/pages/settings/Wallet/AddPayPalMePage.js b/src/pages/settings/Wallet/AddPayPalMePage.js
deleted file mode 100644
index 38eae4d46bbc..000000000000
--- a/src/pages/settings/Wallet/AddPayPalMePage.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import React, {useRef, useCallback} from 'react';
-import {View} from 'react-native';
-import _ from 'underscore';
-import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
-import CONST from '../../../CONST';
-import ROUTES from '../../../ROUTES';
-import compose from '../../../libs/compose';
-import ONYXKEYS from '../../../ONYXKEYS';
-import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
-import TextLink from '../../../components/TextLink';
-import Text from '../../../components/Text';
-import ScreenWrapper from '../../../components/ScreenWrapper';
-import Navigation from '../../../libs/Navigation/Navigation';
-import styles from '../../../styles/styles';
-import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Form from '../../../components/Form';
-import Growl from '../../../libs/Growl';
-import TextInput from '../../../components/TextInput';
-import * as ValidationUtils from '../../../libs/ValidationUtils';
-import * as User from '../../../libs/actions/User';
-import Icon from '../../../components/Icon';
-import * as Expensicons from '../../../components/Icon/Expensicons';
-import variables from '../../../styles/variables';
-import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback';
-import paypalMeDataPropTypes from '../../../components/paypalMeDataPropTypes';
-import * as Link from '../../../libs/actions/Link';
-
-const propTypes = {
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    payPalMeData: {},
-};
-
-const validate = (values) => {
-    const requiredFields = ['payPalMeUsername'];
-    const errors = ValidationUtils.getFieldRequiredErrors(values, requiredFields);
-
-    if (values.payPalMeUsername && !ValidationUtils.isValidPaypalUsername(values.payPalMeUsername)) {
-        errors.payPalMeUsername = 'addPayPalMePage.formatError';
-    }
-
-    return errors;
-};
-
-function AddPayPalMePage(props) {
-    const payPalMeInput = useRef(null);
-
-    const hasPaypalAccount = !_.isEmpty(props.payPalMeData);
-
-    const growlMessageOnSave = props.translate(hasPaypalAccount ? 'addPayPalMePage.growlMessageOnUpdate' : 'addPayPalMePage.growlMessageOnSave');
-
-    /**
-     * Sets the payPalMe username and error data for the current user
-     */
-    const setPayPalMeData = useCallback(
-        (values) => {
-            User.addPaypalMeAddress(values.payPalMeUsername);
-            Growl.show(growlMessageOnSave, CONST.GROWL.SUCCESS, 3000);
-            Navigation.goBack(ROUTES.SETTINGS_WALLET);
-        },
-        [growlMessageOnSave],
-    );
-
-    return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            onEntryTransitionEnd={() => payPalMeInput.current && payPalMeInput.current.focus()}
-        >
-            <HeaderWithBackButton
-                title={props.translate('common.payPalMe')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
-            />
-            <Form
-                style={[styles.flex1, styles.p5]}
-                formID={ONYXKEYS.FORMS.PAYPAL_FORM}
-                validate={validate}
-                onSubmit={setPayPalMeData}
-                submitButtonText={props.translate(hasPaypalAccount ? 'addPayPalMePage.updatePaypalAccount' : 'addPayPalMePage.addPayPalAccount')}
-                enabledWhenOffline
-            >
-                <Text style={[styles.mb4]}>{props.translate('addPayPalMePage.enterYourUsernameToGetPaidViaPayPal')}</Text>
-                <TextInput
-                    inputID="payPalMeUsername"
-                    ref={(ref) => (payPalMeInput.current = ref)}
-                    label={props.translate('addPayPalMePage.payPalMe')}
-                    accessibilityLabel={props.translate('addPayPalMePage.payPalMe')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    autoCompleteType="off"
-                    autoCorrect={false}
-                    placeholder={props.translate('addPayPalMePage.yourPayPalUsername')}
-                    returnKeyType="done"
-                    defaultValue={lodashGet(props.payPalMeData, 'accountData.username', '')}
-                />
-                <View style={[styles.mt3, styles.flexRow, styles.justifyContentBetween, styles.alignSelfStart]}>
-                    <Text style={[styles.textMicro, styles.flexRow]}>{props.translate('addPayPalMePage.checkListOf')}</Text>
-                    <PressableWithoutFeedback
-                        shouldUseAutoHitSlop={false}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
-                        accessibilityLabel={props.translate('addPayPalMePage.supportedCurrencies')}
-                        onPress={() => Link.openExternalLink('https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies')}
-                    >
-                        <View style={[styles.flexRow, styles.cursorPointer]}>
-                            <TextLink
-                                // eslint-disable-next-line max-len
-                                href="https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies"
-                                style={[styles.textMicro]}
-                            >
-                                {props.translate('addPayPalMePage.supportedCurrencies')}
-                            </TextLink>
-                            <View style={[styles.ml1]}>
-                                <Icon
-                                    src={Expensicons.NewWindow}
-                                    height={variables.iconSizeExtraSmall}
-                                    width={variables.iconSizeExtraSmall}
-                                />
-                            </View>
-                        </View>
-                    </PressableWithoutFeedback>
-                </View>
-            </Form>
-        </ScreenWrapper>
-    );
-}
-
-AddPayPalMePage.propTypes = propTypes;
-AddPayPalMePage.defaultProps = defaultProps;
-AddPayPalMePage.displayName = 'AddPayPalMePage';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
-    }),
-)(AddPayPalMePage);
diff --git a/src/pages/settings/Wallet/PaymentMethodList.js b/src/pages/settings/Wallet/PaymentMethodList.js
index 94bcf9f87078..d757db370b05 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.js
+++ b/src/pages/settings/Wallet/PaymentMethodList.js
@@ -16,7 +16,6 @@ import ONYXKEYS from '../../../ONYXKEYS';
 import CONST from '../../../CONST';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import bankAccountPropTypes from '../../../components/bankAccountPropTypes';
-import paypalMeDataPropTypes from '../../../components/paypalMeDataPropTypes';
 import cardPropTypes from '../../../components/cardPropTypes';
 import * as PaymentUtils from '../../../libs/PaymentUtils';
 import FormAlertWrapper from '../../../components/FormAlertWrapper';
@@ -28,9 +27,6 @@ const propTypes = {
     /** What to do when a menu item is pressed */
     onPress: PropTypes.func.isRequired,
 
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
     /** List of bank accounts */
     bankAccountList: PropTypes.objectOf(bankAccountPropTypes),
 
@@ -77,7 +73,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    payPalMeData: {},
     bankAccountList: {},
     fundList: null,
     userWallet: {
@@ -149,14 +144,13 @@ function isPaymentMethodActive(actionPaymentMethodType, activePaymentMethodID, p
     return paymentMethod.accountType === actionPaymentMethodType && paymentMethod.methodID === activePaymentMethodID;
 }
 function PaymentMethodList(props) {
-    const {actionPaymentMethodType, activePaymentMethodID, bankAccountList, fundList, filterType, network, onPress, payPalMeData, shouldShowSelectedState, selectedMethodID, translate} =
-        props;
+    const {actionPaymentMethodType, activePaymentMethodID, bankAccountList, fundList, filterType, network, onPress, shouldShowSelectedState, selectedMethodID, translate} = props;
 
     const filteredPaymentMethods = useMemo(() => {
         const paymentCardList = fundList || {};
         // Hide any billing cards that are not P2P debit cards for now because you cannot make them your default method, or delete them
         const filteredCardList = _.filter(paymentCardList, (card) => card.accountData.additionalData.isP2PDebitCard);
-        let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList, filteredCardList, payPalMeData);
+        let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList, filteredCardList);
 
         if (!_.isEmpty(filterType)) {
             combinedPaymentMethods = _.filter(combinedPaymentMethods, (paymentMethod) => paymentMethod.accountType === filterType);
@@ -180,7 +174,7 @@ function PaymentMethodList(props) {
         }));
 
         return combinedPaymentMethods;
-    }, [actionPaymentMethodType, activePaymentMethodID, bankAccountList, filterType, network, onPress, payPalMeData, fundList]);
+    }, [actionPaymentMethodType, activePaymentMethodID, bankAccountList, filterType, network, onPress, fundList]);
 
     /**
      * Render placeholder when there are no payments methods
@@ -274,9 +268,6 @@ export default compose(
         isLoadingPaymentMethods: {
             key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
         },
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         userWallet: {
             key: ONYXKEYS.USER_WALLET,
         },
diff --git a/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
index 72e31ec72152..be40ef1af495 100644
--- a/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
+++ b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
@@ -49,7 +49,6 @@ function BaseWalletPage(props) {
         selectedPaymentMethodType: null,
     });
     const addPaymentMethodAnchorRef = useRef(null);
-    const deletePaymentMethodAnchorRef = useRef(null);
     const paymentMethodButtonRef = useRef(null);
     const [anchorPosition, setAnchorPosition] = useState({
         anchorPositionHorizontal: 0,
@@ -90,9 +89,6 @@ function BaseWalletPage(props) {
     }, [windowWidth]);
 
     const getSelectedPaymentMethodID = useCallback(() => {
-        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
-            return CONST.PAYMENT_METHODS.PAYPAL;
-        }
         if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
             return paymentMethod.selectedPaymentMethod.bankAccountID;
         }
@@ -102,19 +98,15 @@ function BaseWalletPage(props) {
     }, [paymentMethod.selectedPaymentMethod.bankAccountID, paymentMethod.selectedPaymentMethod.fundID, paymentMethod.selectedPaymentMethodType]);
 
     const resetSelectedPaymentMethodData = useCallback(() => {
-        // The below state values are used by payment method modals and we reset them while closing the modals.
-        // We should only reset the values when the modal animation is completed and so using InteractionManager.runAfterInteractions which fires after all animaitons are complete
-        InteractionManager.runAfterInteractions(() => {
-            // Reset to same values as in the constructor
-            setPaymentMethod({
-                isSelectedPaymentMethodDefault: false,
-                selectedPaymentMethod: {},
-                formattedSelectedPaymentMethod: {
-                    title: '',
-                },
-                methodID: null,
-                selectedPaymentMethodType: null,
-            });
+        // Reset to same values as in the constructor
+        setPaymentMethod({
+            isSelectedPaymentMethodDefault: false,
+            selectedPaymentMethod: {},
+            formattedSelectedPaymentMethod: {
+                title: '',
+            },
+            methodID: null,
+            selectedPaymentMethodType: null,
         });
     }, [setPaymentMethod]);
 
@@ -133,19 +125,17 @@ function BaseWalletPage(props) {
             return;
         }
 
+        if (shouldShowDefaultDeleteMenu) {
+            setShouldShowDefaultDeleteMenu(false);
+            return;
+        }
+
         paymentMethodButtonRef.current = nativeEvent.currentTarget;
 
         // The delete/default menu
         if (accountType) {
             let formattedSelectedPaymentMethod;
-            if (accountType === CONST.PAYMENT_METHODS.PAYPAL) {
-                formattedSelectedPaymentMethod = {
-                    title: 'PayPal.me',
-                    icon: account.icon,
-                    description: PaymentUtils.getPaymentMethodDescription(accountType, account),
-                    type: CONST.PAYMENT_METHODS.PAYPAL,
-                };
-            } else if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
+            if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
                 formattedSelectedPaymentMethod = {
                     title: account.addressName,
                     icon: account.icon,
@@ -190,11 +180,6 @@ function BaseWalletPage(props) {
     const addPaymentMethodTypePressed = (paymentType) => {
         hideAddPaymentMenu();
 
-        if (paymentType === CONST.PAYMENT_METHODS.PAYPAL) {
-            Navigation.navigate(ROUTES.SETTINGS_ADD_PAYPAL_ME);
-            return;
-        }
-
         if (paymentType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD);
             return;
@@ -212,18 +197,12 @@ function BaseWalletPage(props) {
      * Hide the default / delete modal
      * @param {boolean} shouldClearSelectedData - Clear selected payment method data if true
      */
-    const hideDefaultDeleteMenu = useCallback(
-        (shouldClearSelectedData = true) => {
-            setShouldShowDefaultDeleteMenu(false);
-            InteractionManager.runAfterInteractions(() => {
-                setShowConfirmDeleteContent(false);
-                if (shouldClearSelectedData) {
-                    resetSelectedPaymentMethodData();
-                }
-            });
-        },
-        [setShouldShowDefaultDeleteMenu, setShowConfirmDeleteContent, resetSelectedPaymentMethodData],
-    );
+    const hideDefaultDeleteMenu = useCallback(() => {
+        setShouldShowDefaultDeleteMenu(false);
+        InteractionManager.runAfterInteractions(() => {
+            setShowConfirmDeleteContent(false);
+        });
+    }, [setShouldShowDefaultDeleteMenu, setShowConfirmDeleteContent]);
 
     const makeDefaultPaymentMethod = useCallback(() => {
         const paymentCardList = props.fundList || {};
@@ -237,7 +216,6 @@ function BaseWalletPage(props) {
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             PaymentMethods.makeDefaultPaymentMethod(null, paymentMethod.selectedPaymentMethod.fundID, previousPaymentMethod, currentPaymentMethod);
         }
-        resetSelectedPaymentMethodData();
     }, [
         paymentMethod.methodID,
         paymentMethod.selectedPaymentMethod.bankAccountID,
@@ -245,29 +223,20 @@ function BaseWalletPage(props) {
         paymentMethod.selectedPaymentMethodType,
         props.bankAccountList,
         props.fundList,
-        resetSelectedPaymentMethodData,
     ]);
 
     const deletePaymentMethod = useCallback(() => {
-        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
-            PaymentMethods.deletePayPalMe();
-        } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
+        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
             BankAccounts.deletePaymentBankAccount(paymentMethod.selectedPaymentMethod.bankAccountID);
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             PaymentMethods.deletePaymentCard(paymentMethod.selectedPaymentMethod.fundID);
         }
-        resetSelectedPaymentMethodData();
-    }, [paymentMethod.selectedPaymentMethod.bankAccountID, paymentMethod.selectedPaymentMethod.fundID, paymentMethod.selectedPaymentMethodType, resetSelectedPaymentMethodData]);
+    }, [paymentMethod.selectedPaymentMethod.bankAccountID, paymentMethod.selectedPaymentMethod.fundID, paymentMethod.selectedPaymentMethodType]);
 
     const navigateToTransferBalancePage = () => {
         Navigation.navigate(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE);
     };
 
-    const navigateToAddPaypalRoute = () => {
-        Navigation.navigate(ROUTES.SETTINGS_ADD_PAYPAL_ME);
-        setShouldShowDefaultDeleteMenu(false);
-    };
-
     const listHeaderComponent = useCallback(
         () => (
             <>
@@ -359,8 +328,6 @@ function BaseWalletPage(props) {
             shouldResetPaymentMethodData = true;
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD && _.isEmpty(props.fundList[paymentMethod.methodID])) {
             shouldResetPaymentMethodData = true;
-        } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL && _.isEmpty(props.payPalMeData)) {
-            shouldResetPaymentMethodData = true;
         }
         if (shouldResetPaymentMethodData) {
             // Close corresponding selected payment method modals which are open
@@ -368,13 +335,11 @@ function BaseWalletPage(props) {
                 hideDefaultDeleteMenu();
             }
         }
-    }, [hideDefaultDeleteMenu, paymentMethod.methodID, paymentMethod.selectedPaymentMethodType, props.bankAccountList, props.fundList, props.payPalMeData, shouldShowDefaultDeleteMenu]);
+    }, [hideDefaultDeleteMenu, paymentMethod.methodID, paymentMethod.selectedPaymentMethodType, props.bankAccountList, props.fundList, shouldShowDefaultDeleteMenu]);
 
-    const isPayPalMeSelected = paymentMethod.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PAYPAL;
     const shouldShowMakeDefaultButton =
         !paymentMethod.isSelectedPaymentMethodDefault &&
         Permissions.canUseWallet(props.betas) &&
-        !isPayPalMeSelected &&
         !(paymentMethod.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT && paymentMethod.selectedPaymentMethod.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS);
 
     // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
@@ -424,7 +389,8 @@ function BaseWalletPage(props) {
                     right: anchorPosition.anchorPositionRight,
                 }}
                 withoutOverlay
-                anchorRef={deletePaymentMethodAnchorRef}
+                anchorRef={paymentMethodButtonRef}
+                onModalHide={resetSelectedPaymentMethodData}
             >
                 {!showConfirmDeleteContent ? (
                     <View style={[styles.m5, !isSmallScreenWidth ? styles.sidebarPopover : '']}>
@@ -440,20 +406,12 @@ function BaseWalletPage(props) {
                         {shouldShowMakeDefaultButton && (
                             <Button
                                 onPress={() => {
-                                    setShouldShowDefaultDeleteMenu(false);
                                     makeDefaultPaymentMethod();
+                                    setShouldShowDefaultDeleteMenu(false);
                                 }}
                                 text={translate('walletPage.setDefaultConfirmation')}
                             />
                         )}
-                        {isPayPalMeSelected && (
-                            <Button
-                                onPress={navigateToAddPaypalRoute}
-                                style={[styles.mb4]}
-                                text={translate('common.edit')}
-                                shouldUseDefaultHover
-                            />
-                        )}
                         <Button
                             onPress={() => {
                                 setShowConfirmDeleteContent(true);
@@ -461,14 +419,13 @@ function BaseWalletPage(props) {
                             style={[shouldShowMakeDefaultButton ? styles.mt4 : {}]}
                             text={translate('common.delete')}
                             danger
-                            ref={deletePaymentMethodAnchorRef}
                         />
                     </View>
                 ) : (
                     <ConfirmContent
                         onConfirm={() => {
-                            hideDefaultDeleteMenu(false);
                             deletePaymentMethod();
+                            hideDefaultDeleteMenu();
                         }}
                         onCancel={hideDefaultDeleteMenu}
                         contentStyles={!isSmallScreenWidth ? [styles.sidebarPopover, styles.willChangeTransform] : undefined}
@@ -514,9 +471,6 @@ export default compose(
         walletTerms: {
             key: ONYXKEYS.WALLET_TERMS,
         },
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         isLoadingPaymentMethods: {
             key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
         },
diff --git a/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js b/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
index 5e3f1109f8fb..cdfe19cbf2b4 100644
--- a/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
+++ b/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
@@ -5,7 +5,6 @@ import bankAccountPropTypes from '../../../../components/bankAccountPropTypes';
 import cardPropTypes from '../../../../components/cardPropTypes';
 import userWalletPropTypes from '../../../EnablePayments/userWalletPropTypes';
 import walletTermsPropTypes from '../../../EnablePayments/walletTermsPropTypes';
-import paypalMeDataPropTypes from '../../../../components/paypalMeDataPropTypes';
 
 const propTypes = {
     /** Wallet balance transfer props */
@@ -34,9 +33,6 @@ const propTypes = {
 
     /** Information about the user accepting the terms for payments */
     walletTerms: walletTermsPropTypes,
-
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
 };
 
 const defaultProps = {
@@ -50,7 +46,6 @@ const defaultProps = {
     bankAccountList: {},
     fundList: null,
     walletTerms: {},
-    payPalMeData: {},
 };
 
 export {propTypes, defaultProps};
diff --git a/src/pages/signin/LoginForm/BaseLoginForm.js b/src/pages/signin/LoginForm/BaseLoginForm.js
index ccf67844e7f6..9c9cc2d1f3c5 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.js
+++ b/src/pages/signin/LoginForm/BaseLoginForm.js
@@ -230,13 +230,14 @@ function LoginForm(props) {
                 // We need to unmount the submit button when the component is not visible so that the Enter button
                 // key handler gets unsubscribed
                 props.isVisible && (
-                    <View style={[styles.mt5]}>
+                    <View style={[!_.isEmpty(serverErrorText) ? {} : styles.mt5]}>
                         <FormAlertWithSubmitButton
                             buttonText={translate('common.continue')}
                             isLoading={props.account.isLoading && props.account.loadingForm === CONST.FORMS.LOGIN_FORM}
                             onSubmit={validateAndSubmitForm}
                             message={serverErrorText}
                             isAlertVisible={!_.isEmpty(serverErrorText)}
+                            buttonStyles={[!_.isEmpty(serverErrorText) ? styles.mt3 : {}]}
                             containerStyles={[styles.mh0]}
                         />
                         {
diff --git a/src/pages/signin/SignInHeroCopy.js b/src/pages/signin/SignInHeroCopy.js
index 93951c0b9236..c2caa3ea1296 100644
--- a/src/pages/signin/SignInHeroCopy.js
+++ b/src/pages/signin/SignInHeroCopy.js
@@ -13,13 +13,18 @@ const propTypes = {
     /** Override the green headline copy */
     customHeadline: PropTypes.string,
 
+    /** Override the smaller hero body copy below the headline */
+    customHeroBody: PropTypes.string,
+
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     customHeadline: '',
+    customHeroBody: '',
 };
+
 function SignInHeroCopy(props) {
     return (
         <View style={[styles.flex1, styles.alignSelfCenter, styles.gap7]}>
@@ -32,7 +37,7 @@ function SignInHeroCopy(props) {
             >
                 {props.customHeadline || props.translate('login.hero.header')}
             </Text>
-            <Text style={[styles.loginHeroBody]}>{props.translate('login.hero.body')}</Text>
+            <Text style={[styles.loginHeroBody]}>{props.customHeroBody || props.translate('login.hero.body')}</Text>
         </View>
     );
 }
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 21a92bce41c0..3e27e6cd253a 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -19,7 +19,6 @@ import * as StyleUtils from '../../styles/StyleUtils';
 import useLocalize from '../../hooks/useLocalize';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import Log from '../../libs/Log';
-import * as DemoActions from '../../libs/actions/DemoActions';
 
 const propTypes = {
     /** The details about the account that the user is signing in with */
@@ -49,20 +48,12 @@ const propTypes = {
 
     /** Whether or not the sign in page is being rendered in the RHP modal */
     isInModal: PropTypes.bool,
-
-    /** Information about any currently running demos */
-    demoInfo: PropTypes.shape({
-        saastr: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-    }),
 };
 
 const defaultProps = {
     account: {},
     credentials: {},
     isInModal: false,
-    demoInfo: {},
 };
 
 /**
@@ -90,7 +81,7 @@ function getRenderOptions({hasLogin, hasValidateCode, hasAccount, isPrimaryLogin
     };
 }
 
-function SignInPage({credentials, account, isInModal, demoInfo}) {
+function SignInPage({credentials, account, isInModal}) {
     const {translate, formatPhoneNumber} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const shouldShowSmallScreen = isSmallScreenWidth || isInModal;
@@ -115,8 +106,7 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
 
     let welcomeHeader = '';
     let welcomeText = '';
-    const customHeadline = DemoActions.getHeadlineKeyByDemoInfo(demoInfo);
-    const headerText = customHeadline || translate('login.hero.header');
+    const headerText = translate('login.hero.header');
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? headerText : translate('welcomeText.getStarted');
         welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
@@ -164,7 +154,6 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
                 shouldShowWelcomeText={shouldShowWelcomeText}
                 ref={signInPageLayoutRef}
                 isInModal={isInModal}
-                customHeadline={customHeadline}
             >
                 {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
                     so that password managers can access the values. Conditionally rendering this component will break this feature. */}
@@ -188,5 +177,4 @@ SignInPage.displayName = 'SignInPage';
 export default withOnyx({
     account: {key: ONYXKEYS.ACCOUNT},
     credentials: {key: ONYXKEYS.CREDENTIALS},
-    demoInfo: {key: ONYXKEYS.DEMO_INFO},
 })(SignInPage);
diff --git a/src/pages/signin/SignInPageHero.js b/src/pages/signin/SignInPageHero.js
index eb2a275a49f7..89e9088d12f2 100644
--- a/src/pages/signin/SignInPageHero.js
+++ b/src/pages/signin/SignInPageHero.js
@@ -12,11 +12,15 @@ const propTypes = {
     /** Override the green headline copy */
     customHeadline: PropTypes.string,
 
+    /** Override the smaller hero body copy below the headline */
+    customHeroBody: PropTypes.string,
+
     ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
     customHeadline: '',
+    customHeroBody: '',
 };
 
 function SignInPageHero(props) {
@@ -33,7 +37,10 @@ function SignInPageHero(props) {
         >
             <View style={[styles.flex1, styles.alignSelfCenter, styles.gap7]}>
                 <SignInHeroImage />
-                <SignInHeroCopy customHeadline={props.customHeadline} />
+                <SignInHeroCopy
+                    customHeadline={props.customHeadline}
+                    customHeroBody={props.customHeroBody}
+                />
             </View>
         </View>
     );
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 52a8875a8e04..03b286727afb 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -44,6 +44,9 @@ const propTypes = {
     /** Override the green headline copy */
     customHeadline: PropTypes.string,
 
+    /** Override the smaller hero body copy below the headline */
+    customHeroBody: PropTypes.string,
+
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
@@ -51,6 +54,7 @@ const propTypes = {
 const defaultProps = {
     innerRef: () => {},
     customHeadline: '',
+    customHeroBody: '',
 };
 
 function SignInPageLayout(props) {
@@ -133,7 +137,10 @@ function SignInPageLayout(props) {
                                         props.isLargeScreenWidth ? styles.ph25 : {},
                                     ]}
                                 >
-                                    <SignInPageHero customHeadline={props.customHeadline} />
+                                    <SignInPageHero
+                                        customHeadline={props.customHeadline}
+                                        customHeroBody={props.customHeroBody}
+                                    />
                                     <Footer scrollPageToTop={scrollPageToTop} />
                                 </View>
                             </View>
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index 41f0d222e80b..51cb287f9564 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -87,6 +87,7 @@ function BaseValidateCodeForm(props) {
 
     const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);
     const isLoadingResendValidationForm = props.account.loadingForm === CONST.FORMS.RESEND_VALIDATE_CODE_FORM;
+    const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
 
     useEffect(() => {
         if (!(inputValidateCodeRef.current && hasError && (props.session.autoAuthState === CONST.AUTO_AUTH_STATE.FAILED || props.account.isLoading))) {
@@ -279,13 +280,13 @@ function BaseValidateCodeForm(props) {
                                 style={[styles.mt2]}
                                 onPress={resendValidateCode}
                                 underlayColor={themeColors.componentBG}
-                                disabled={props.network.isOffline}
+                                disabled={shouldDisableResendValidateCode}
                                 hoverDimmingValue={1}
                                 pressDimmingValue={0.2}
                                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                                 accessibilityLabel={props.translate('validateCodeForm.magicCodeNotReceived')}
                             >
-                                <Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>
+                                <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>
                                     {hasError ? props.translate('validateCodeForm.requestNewCodeAfterErrorOccurred') : props.translate('validateCodeForm.magicCodeNotReceived')}
                                 </Text>
                             </PressableWithFeedback>
diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index f8f076a1630c..9fb600e40753 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useMemo} from 'react';
+import React, {useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -63,11 +63,12 @@ const defaultProps = {
 };
 
 function NewTaskPage(props) {
-    const [assignee, setAssignee] = React.useState({});
-    const [shareDestination, setShareDestination] = React.useState({});
-    const [errorMessage, setErrorMessage] = React.useState('');
-    const [parentReport, setParentReport] = React.useState({});
-    const shouldClearOutTaskInfoOnUnmount = React.useRef(false);
+    const [assignee, setAssignee] = useState({});
+    const [shareDestination, setShareDestination] = useState({});
+    const [title, setTitle] = useState('');
+    const [description, setDescription] = useState('');
+    const [errorMessage, setErrorMessage] = useState('');
+    const [parentReport, setParentReport] = useState({});
 
     const isAllowedToCreateTask = useMemo(() => _.isEmpty(parentReport) || ReportUtils.isAllowedToComment(parentReport), [parentReport]);
 
@@ -95,17 +96,17 @@ function NewTaskPage(props) {
             const displayDetails = Task.getShareDestination(props.task.shareDestination, props.reports, props.personalDetails);
             setShareDestination(displayDetails);
         }
-    }, [props]);
 
-    useEffect(
-        () => () => {
-            if (!shouldClearOutTaskInfoOnUnmount.current) {
-                return;
-            }
-            Task.clearOutTaskInfo();
-        },
-        [],
-    );
+        // If we have a title, we want to set the title
+        if (!_.isUndefined(props.task.title)) {
+            setTitle(props.task.title);
+        }
+
+        // If we have a description, we want to set the description
+        if (!_.isUndefined(props.task.description)) {
+            setDescription(props.task.description);
+        }
+    }, [props]);
 
     // On submit, we want to call the createTask function and wait to validate
     // the response
@@ -125,7 +126,6 @@ function NewTaskPage(props) {
             return;
         }
 
-        shouldClearOutTaskInfoOnUnmount.current = true;
         Task.createTaskAndNavigate(parentReport.reportID, props.task.title, props.task.description, props.task.assignee, props.task.assigneeAccountID, props.task.assigneeChatReport);
     }
 
@@ -153,15 +153,16 @@ function NewTaskPage(props) {
                     <View style={styles.mb5}>
                         <MenuItemWithTopDescription
                             description={props.translate('task.title')}
-                            title={props.task.title || ''}
+                            title={title}
                             onPress={() => Navigation.navigate(ROUTES.NEW_TASK_TITLE)}
                             shouldShowRightIcon
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('task.description')}
-                            title={props.task.description || ''}
+                            title={description}
                             onPress={() => Navigation.navigate(ROUTES.NEW_TASK_DESCRIPTION)}
                             shouldShowRightIcon
+                            shouldParseTitle
                             numberOfLinesTitle={2}
                             titleStyle={styles.flex1}
                         />
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.js b/src/pages/tasks/TaskAssigneeSelectorModal.js
index e7dfc6472abd..c4dd2dee2d8c 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.js
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.js
@@ -1,5 +1,5 @@
 /* eslint-disable es/no-optional-chaining */
-import React, {useState, useEffect, useMemo, useCallback} from 'react';
+import React, {useState, useEffect, useMemo, useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
@@ -17,9 +17,11 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
 import compose from '../../libs/compose';
 import personalDetailsPropType from '../personalDetailsPropType';
 import reportPropTypes from '../reportPropTypes';
+import * as ReportUtils from '../../libs/ReportUtils';
 import ROUTES from '../../ROUTES';
-
 import * as Task from '../../libs/actions/Task';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
 
 const propTypes = {
     /** Beta features list */
@@ -78,6 +80,8 @@ function TaskAssigneeSelectorModal(props) {
     const [filteredCurrentUserOption, setFilteredCurrentUserOption] = useState(null);
     const [isLoading, setIsLoading] = React.useState(true);
 
+    const optionRef = useRef();
+
     const updateOptions = useCallback(() => {
         const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getNewChatOptions(
             props.reports,
@@ -89,6 +93,9 @@ function TaskAssigneeSelectorModal(props) {
             false,
             true,
             false,
+            {},
+            [],
+            false,
         );
 
         setHeaderMessage(OptionsListUtils.getHeaderMessage(recentReports?.length + personalDetails?.length !== 0 || currentUserOption, Boolean(userToInvite), searchValue));
@@ -121,6 +128,12 @@ function TaskAssigneeSelectorModal(props) {
         return props.reports[`${ONYXKEYS.COLLECTION.REPORT}${props.route.params.reportID}`];
     }, [props.reports, props.route.params]);
 
+    if (report && !ReportUtils.isTaskReport(report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(report.reportID);
+        });
+    }
+
     const sections = useMemo(() => {
         const sectionsList = [];
         let indexOffset = 0;
@@ -181,14 +194,21 @@ function TaskAssigneeSelectorModal(props) {
             const assigneeChatReport = Task.setAssigneeValue(option.login, option.accountID, props.route.params.reportID, OptionsListUtils.isCurrentUser(option));
 
             // Pass through the selected assignee
-            Task.editTaskAssigneeAndNavigate(props.task.report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
+            Task.editTaskAssigneeAndNavigate(report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
         }
     };
 
+    const isOpen = ReportUtils.isOpenTaskReport(props.task.report);
+    const canModifyTask = Task.canModifyTask(props.task.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = report && ReportUtils.isTaskReport(props.task.report) && (!canModifyTask || !isOpen);
+
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionRef.current && optionRef.current.textInput.focus()}
+        >
             {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                <>
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
                     <HeaderWithBackButton
                         title={props.translate('task.assignee')}
                         onBackButtonPress={() => (lodashGet(props.route.params, 'reportID') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}
@@ -204,9 +224,11 @@ function TaskAssigneeSelectorModal(props) {
                             shouldShowOptions={didScreenTransitionEnd && !isLoading}
                             textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            autoFocus={false}
+                            ref={optionRef}
                         />
                     </View>
-                </>
+                </FullPageNotFoundView>
             )}
         </ScreenWrapper>
     );
@@ -218,6 +240,7 @@ TaskAssigneeSelectorModal.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
index d1679ac104ce..382e8d80d4ad 100644
--- a/src/pages/tasks/TaskDescriptionPage.js
+++ b/src/pages/tasks/TaskDescriptionPage.js
@@ -12,9 +12,14 @@ import reportPropTypes from '../reportPropTypes';
 import styles from '../../styles/styles';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
+import * as ReportUtils from '../../libs/ReportUtils';
 import CONST from '../../CONST';
 import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
 import * as Browser from '../../libs/Browser';
+import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** Current user session */
@@ -46,39 +51,61 @@ function TaskDescriptionPage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
     const inputRef = useRef(null);
 
+    const isOpen = ReportUtils.isOpenTaskReport(props.report);
+    const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = ReportUtils.isTaskReport(props.report) && (!canModifyTask || !isOpen);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)}
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton title={props.translate('task.task')} />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
-                validate={validate}
-                onSubmit={submit}
-                submitButtonText={props.translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={[styles.mb4]}>
-                    <TextInput
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        inputID="description"
-                        name="description"
-                        label={props.translate('newTaskPage.descriptionOptional')}
-                        accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
-                        defaultValue={(props.report && props.report.description) || ''}
-                        ref={(el) => (inputRef.current = el)}
-                        autoGrowHeight
-                        submitOnEnter={!Browser.isMobile()}
-                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                        textAlignVertical="top"
-                    />
-                </View>
-            </Form>
+            {({didScreenTransitionEnd}) => (
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
+                    <HeaderWithBackButton title={props.translate('task.task')} />
+                    <Form
+                        style={[styles.flexGrow1, styles.ph5]}
+                        formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
+                        validate={validate}
+                        onSubmit={submit}
+                        submitButtonText={props.translate('common.save')}
+                        enabledWhenOffline
+                    >
+                        <View style={[styles.mb4]}>
+                            <TextInput
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                inputID="description"
+                                name="description"
+                                label={props.translate('newTaskPage.descriptionOptional')}
+                                accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
+                                defaultValue={(props.report && props.report.description) || ''}
+                                ref={(el) => {
+                                    // if we wrap the page with FullPageNotFoundView we need to explicitly handle focusing on text input
+                                    if (!el) {
+                                        return;
+                                    }
+                                    if (!inputRef.current && didScreenTransitionEnd) {
+                                        focusAndUpdateMultilineInputRange(el);
+                                    }
+                                    inputRef.current = el;
+                                }}
+                                autoGrowHeight
+                                submitOnEnter={!Browser.isMobile()}
+                                containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                textAlignVertical="top"
+                            />
+                        </View>
+                    </Form>
+                </FullPageNotFoundView>
+            )}
         </ScreenWrapper>
     );
 }
@@ -88,6 +115,8 @@ TaskDescriptionPage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.js b/src/pages/tasks/TaskShareDestinationSelectorModal.js
index 15e3f03964e6..44d7b1f6a633 100644
--- a/src/pages/tasks/TaskShareDestinationSelectorModal.js
+++ b/src/pages/tasks/TaskShareDestinationSelectorModal.js
@@ -1,5 +1,5 @@
 /* eslint-disable es/no-optional-chaining */
-import React, {useState, useEffect, useMemo, useCallback} from 'react';
+import React, {useState, useEffect, useMemo, useCallback, useRef} from 'react';
 import _ from 'underscore';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
@@ -46,10 +46,16 @@ function TaskShareDestinationSelectorModal(props) {
     const [headerMessage, setHeaderMessage] = useState('');
     const [filteredRecentReports, setFilteredRecentReports] = useState([]);
 
+    const optionRef = useRef();
+
     const filteredReports = useMemo(() => {
         const reports = {};
         _.keys(props.reports).forEach((reportKey) => {
-            if (ReportUtils.shouldDisableWriteActions(props.reports[reportKey]) || ReportUtils.isExpensifyOnlyParticipantInReport(props.reports[reportKey])) {
+            if (
+                ReportUtils.shouldDisableWriteActions(props.reports[reportKey]) ||
+                ReportUtils.isExpensifyOnlyParticipantInReport(props.reports[reportKey]) ||
+                ReportUtils.isCanceledTaskReport(props.reports[reportKey])
+            ) {
                 return;
             }
             reports[reportKey] = props.reports[reportKey];
@@ -107,7 +113,10 @@ function TaskShareDestinationSelectorModal(props) {
 
     const sections = getSections();
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionRef.current && optionRef.current.textInput.focus()}
+        >
             {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
@@ -127,6 +136,8 @@ function TaskShareDestinationSelectorModal(props) {
                             shouldShowOptions={didScreenTransitionEnd}
                             textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            autoFocus={false}
+                            ref={optionRef}
                         />
                     </View>
                 </>
diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js
index cf0c269a6133..9a7a36a1e119 100644
--- a/src/pages/tasks/TaskTitlePage.js
+++ b/src/pages/tasks/TaskTitlePage.js
@@ -13,7 +13,12 @@ import styles from '../../styles/styles';
 import reportPropTypes from '../reportPropTypes';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
+import * as ReportUtils from '../../libs/ReportUtils';
 import CONST from '../../CONST';
+import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -58,7 +63,16 @@ function TaskTitlePage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
+
     const inputRef = useRef(null);
+    const isOpen = ReportUtils.isOpenTaskReport(props.report);
+    const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = ReportUtils.isTaskReport(props.report) && (!canModifyTask || !isOpen);
 
     return (
         <ScreenWrapper
@@ -66,27 +80,37 @@ function TaskTitlePage(props) {
             onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()}
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton title={props.translate('task.task')} />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
-                validate={validate}
-                onSubmit={submit}
-                submitButtonText={props.translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={[styles.mb4]}>
-                    <TextInput
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        inputID="title"
-                        name="title"
-                        label={props.translate('task.title')}
-                        accessibilityLabel={props.translate('task.title')}
-                        defaultValue={(props.report && props.report.reportName) || ''}
-                        ref={(el) => (inputRef.current = el)}
-                    />
-                </View>
-            </Form>
+            {({didScreenTransitionEnd}) => (
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
+                    <HeaderWithBackButton title={props.translate('task.task')} />
+                    <Form
+                        style={[styles.flexGrow1, styles.ph5]}
+                        formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
+                        validate={validate}
+                        onSubmit={submit}
+                        submitButtonText={props.translate('common.save')}
+                        enabledWhenOffline
+                    >
+                        <View style={[styles.mb4]}>
+                            <TextInput
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                inputID="title"
+                                name="title"
+                                label={props.translate('task.title')}
+                                accessibilityLabel={props.translate('task.title')}
+                                defaultValue={(props.report && props.report.reportName) || ''}
+                                ref={(el) => {
+                                    if (!el) return;
+                                    if (!inputRef.current && didScreenTransitionEnd) {
+                                        el.focus();
+                                    }
+                                    inputRef.current = el;
+                                }}
+                            />
+                        </View>
+                    </Form>
+                </FullPageNotFoundView>
+            )}
         </ScreenWrapper>
     );
 }
@@ -96,6 +120,8 @@ TaskTitlePage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 0d6599631b8d..8f93434e6845 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -104,7 +104,7 @@ function WorkspaceInitialPage(props) {
     const goToRoom = useCallback(
         (type) => {
             const room = _.find(props.reports, (report) => report && report.policyID === policy.id && report.chatType === type && !ReportUtils.isThread(report));
-            Navigation.navigate(ROUTES.getReportRoute(room.reportID));
+            Navigation.dismissModal(room.reportID);
         },
         [props.reports, policy],
     );
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index 6db3a20a3e4a..e37588d2d401 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -186,7 +186,7 @@ function WorkspaceInvitePage(props) {
     );
 
     const headerMessage = useMemo(() => {
-        const searchValue = searchTerm.trim();
+        const searchValue = searchTerm.trim().toLowerCase();
         if (!userToInvite && CONST.EXPENSIFY_EMAILS.includes(searchValue)) {
             return translate('messages.errorMessageInvalidEmail');
         }
@@ -227,7 +227,6 @@ function WorkspaceInvitePage(props) {
                             onSelectRow={toggleOption}
                             onConfirm={inviteUser}
                             showScrollIndicator
-                            shouldDelayFocus
                             showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(props.personalDetails)}
                         />
                         <View style={[styles.flexShrink0]}>
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index d598f90e4326..7bb9a91c130e 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useState, useMemo} from 'react';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
@@ -75,6 +75,8 @@ function WorkspaceMembersPage(props) {
     const [errors, setErrors] = useState({});
     const [searchValue, setSearchValue] = useState('');
     const prevIsOffline = usePrevious(props.network.isOffline);
+    const accountIDs = useMemo(() => _.keys(props.policyMembers), [props.policyMembers]);
+    const prevAccountIDs = usePrevious(accountIDs);
 
     /**
      * Get members for the current workspace
@@ -109,6 +111,9 @@ function WorkspaceMembersPage(props) {
     }, [props.preferredLocale, validateSelection]);
 
     useEffect(() => {
+        if (removeMembersConfirmModalVisible && !_.isEqual(accountIDs, prevAccountIDs)) {
+            setRemoveMembersConfirmModalVisible(false);
+        }
         setSelectedEmployees((prevSelected) =>
             _.intersection(
                 prevSelected,
@@ -307,6 +312,7 @@ function WorkspaceMembersPage(props) {
 
             result.push({
                 keyForList: accountID,
+                accountID: Number(accountID),
                 isSelected: _.contains(selectedEmployees, Number(accountID)),
                 isDisabled: accountID === props.session.accountID || details.login === props.policy.owner || policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 text: props.formatPhoneNumber(details.displayName),
@@ -393,7 +399,6 @@ function WorkspaceMembersPage(props) {
                             onSelectAll={() => toggleAllUsers(data)}
                             onDismissError={dismissError}
                             showLoadingPlaceholder={!OptionsListUtils.isPersonalDetailsReady(props.personalDetails) || _.isEmpty(props.policyMembers)}
-                            shouldDelayFocus
                             showScrollIndicator
                         />
                     </View>
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 0321394b37bc..f112744842b3 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -3,13 +3,14 @@ import {View} from 'react-native';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
+import withNavigationFocus, {withNavigationFocusPropTypes} from '../../components/withNavigationFocus';
 import * as Report from '../../libs/actions/Report';
 import useLocalize from '../../hooks/useLocalize';
-import HeaderWithBackButton from '../../components/HeaderWithBackButton';
-import ScreenWrapper from '../../components/ScreenWrapper';
 import styles from '../../styles/styles';
 import RoomNameInput from '../../components/RoomNameInput';
 import Picker from '../../components/Picker';
+import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
+import ScreenWrapper from '../../components/ScreenWrapper';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import Text from '../../components/Text';
@@ -19,9 +20,10 @@ import * as ValidationUtils from '../../libs/ValidationUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as PolicyUtils from '../../libs/PolicyUtils';
 import Form from '../../components/Form';
-import shouldDelayFocus from '../../libs/shouldDelayFocus';
 import policyMemberPropType from '../policyMemberPropType';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import compose from '../../libs/compose';
+import variables from '../../styles/variables';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -55,6 +57,8 @@ const propTypes = {
 
     /** A collection of objects for all policies which key policy member objects by accountIDs */
     allPolicyMembers: PropTypes.objectOf(PropTypes.objectOf(policyMemberPropType)),
+
+    ...withNavigationFocusPropTypes,
 };
 const defaultProps = {
     betas: [],
@@ -140,60 +144,72 @@ function WorkspaceNewRoomPage(props) {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnablePickerAvoiding={false}
-        >
-            <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length}>
-                <HeaderWithBackButton title={translate('newRoomPage.newRoom')} />
-                <Form
-                    formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-                    submitButtonText={translate('newRoomPage.createRoom')}
-                    scrollContextEnabled
-                    style={[styles.mh5, styles.flexGrow1]}
-                    validate={validate}
-                    onSubmit={submit}
-                    enabledWhenOffline
-                >
-                    <View style={styles.mb5}>
-                        <RoomNameInput
-                            inputID="roomName"
-                            autoFocus
-                            shouldDelayFocus={shouldDelayFocus}
-                        />
-                    </View>
-                    <View style={styles.mb2}>
-                        <Picker
-                            inputID="policyID"
-                            label={translate('workspace.common.workspace')}
-                            placeholder={{value: '', label: translate('newRoomPage.selectAWorkspace')}}
-                            items={workspaceOptions}
-                            onValueChange={setPolicyID}
-                        />
-                    </View>
-                    {isPolicyAdmin && (
-                        <View style={styles.mb2}>
-                            <Picker
-                                inputID="writeCapability"
-                                label={translate('writeCapabilityPage.label')}
-                                items={writeCapabilityOptions}
-                                defaultValue={CONST.REPORT.WRITE_CAPABILITIES.ALL}
-                            />
-                        </View>
-                    )}
-                    <View style={styles.mb2}>
-                        <Picker
-                            inputID="visibility"
-                            label={translate('newRoomPage.visibility')}
-                            items={visibilityOptions}
-                            onValueChange={setVisibility}
-                            defaultValue={CONST.REPORT.VISIBILITY.RESTRICTED}
-                        />
-                    </View>
-                    <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-                </Form>
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+        <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length}>
+            <ScreenWrapper
+                shouldEnableKeyboardAvoidingView={false}
+                includeSafeAreaPaddingBottom={false}
+                includePaddingTop={false}
+                shouldEnablePickerAvoiding={false}
+            >
+                {({insets}) => (
+                    <KeyboardAvoidingView
+                        style={{height: '100%'}}
+                        behavior="height"
+                        // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                        // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                        keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
+                    >
+                        <Form
+                            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+                            submitButtonText={translate('newRoomPage.createRoom')}
+                            scrollContextEnabled
+                            style={[styles.mh5, styles.flexGrow1]}
+                            validate={validate}
+                            onSubmit={submit}
+                            enabledWhenOffline
+                        >
+                            <View style={styles.mb5}>
+                                <RoomNameInput
+                                    inputID="roomName"
+                                    isFocused={props.isFocused}
+                                    shouldDelayFocus
+                                    autoFocus
+                                />
+                            </View>
+                            <View style={styles.mb2}>
+                                <Picker
+                                    inputID="policyID"
+                                    label={translate('workspace.common.workspace')}
+                                    placeholder={{value: '', label: translate('newRoomPage.selectAWorkspace')}}
+                                    items={workspaceOptions}
+                                    onValueChange={setPolicyID}
+                                />
+                            </View>
+                            {isPolicyAdmin && (
+                                <View style={styles.mb2}>
+                                    <Picker
+                                        inputID="writeCapability"
+                                        label={translate('writeCapabilityPage.label')}
+                                        items={writeCapabilityOptions}
+                                        defaultValue={CONST.REPORT.WRITE_CAPABILITIES.ALL}
+                                    />
+                                </View>
+                            )}
+                            <View style={styles.mb2}>
+                                <Picker
+                                    inputID="visibility"
+                                    label={translate('newRoomPage.visibility')}
+                                    items={visibilityOptions}
+                                    onValueChange={setVisibility}
+                                    defaultValue={CONST.REPORT.VISIBILITY.RESTRICTED}
+                                />
+                            </View>
+                            <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
+                        </Form>
+                    </KeyboardAvoidingView>
+                )}
+            </ScreenWrapper>
+        </FullPageNotFoundView>
     );
 }
 
@@ -201,17 +217,20 @@ WorkspaceNewRoomPage.propTypes = propTypes;
 WorkspaceNewRoomPage.defaultProps = defaultProps;
 WorkspaceNewRoomPage.displayName = 'WorkspaceNewRoomPage';
 
-export default withOnyx({
-    betas: {
-        key: ONYXKEYS.BETAS,
-    },
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-    reports: {
-        key: ONYXKEYS.COLLECTION.REPORT,
-    },
-    allPolicyMembers: {
-        key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    },
-})(WorkspaceNewRoomPage);
+export default compose(
+    withNavigationFocus,
+    withOnyx({
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
+        policies: {
+            key: ONYXKEYS.COLLECTION.POLICY,
+        },
+        reports: {
+            key: ONYXKEYS.COLLECTION.REPORT,
+        },
+        allPolicyMembers: {
+            key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
+        },
+    }),
+)(WorkspaceNewRoomPage);
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js
index 7aff9093c4dd..2a9576d5d8d3 100644
--- a/src/pages/workspace/WorkspaceSettingsPage.js
+++ b/src/pages/workspace/WorkspaceSettingsPage.js
@@ -20,6 +20,7 @@ import {withNetwork} from '../../components/OnyxProvider';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import Form from '../../components/Form';
 import * as ReportUtils from '../../libs/ReportUtils';
+import * as UserUtils from '../../libs/UserUtils';
 import Avatar from '../../components/Avatar';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
@@ -125,6 +126,9 @@ function WorkspaceSettingsPage(props) {
                         pendingAction={lodashGet(props.policy, 'pendingFields.avatar', null)}
                         errors={lodashGet(props.policy, 'errorFields.avatar', null)}
                         onErrorClose={() => Policy.clearAvatarErrors(props.policy.id)}
+                        previewSource={UserUtils.getFullSizeAvatar(props.policy.avatar, '')}
+                        headerTitle={props.translate('workspace.common.workspaceAvatar')}
+                        originalFileName={props.policy.originalFileName}
                     />
                     <OfflineWithFeedback pendingAction={lodashGet(props.policy, 'pendingFields.generalSettings')}>
                         <TextInput
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
index 5a150c2c4eb2..e551e0d6d1b9 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
@@ -42,7 +42,7 @@ class WorkspaceRateAndUnitPage extends React.Component {
     getUnitItems() {
         return [
             {label: this.props.translate('workspace.reimburse.kilometers'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS},
-            {label: this.props.translate('workspace.reimburse.miles'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+            {label: this.props.translate('common.miles'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
         ];
     }
 
@@ -93,9 +93,11 @@ class WorkspaceRateAndUnitPage extends React.Component {
     validate(values) {
         const errors = {};
         const decimalSeparator = this.props.toLocaleDigit('.');
-        const rateValueRegex = RegExp(String.raw`^\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,3})?$`, 'i');
+        const rateValueRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,3})?$`, 'i');
         if (!rateValueRegex.test(values.rate) || values.rate === '') {
             errors.rate = 'workspace.reimburse.invalidRateError';
+        } else if (parseFloat(values.rate) <= 0) {
+            errors.rate = 'workspace.reimburse.lowRateError';
         }
         return errors;
     }
diff --git a/src/stories/ButtonWithDropdownMenu.stories.js b/src/stories/ButtonWithDropdownMenu.stories.js
index 854483df4316..7629a6ff0e17 100644
--- a/src/stories/ButtonWithDropdownMenu.stories.js
+++ b/src/stories/ButtonWithDropdownMenu.stories.js
@@ -20,7 +20,7 @@ function Template(args) {
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
 const Default = Template.bind({});
 Default.args = {
-    buttonText: 'Pay with PayPal.me',
+    buttonText: 'Pay using Expensify',
     options: [
         {value: 1, text: 'One'},
         {value: 2, text: 'Two'},
diff --git a/src/stories/PopoverMenu.stories.js b/src/stories/PopoverMenu.stories.js
index 1098fa9ce226..5f8fb8994e1f 100644
--- a/src/stories/PopoverMenu.stories.js
+++ b/src/stories/PopoverMenu.stories.js
@@ -44,11 +44,6 @@ function Template(args) {
                             icon: Expensicons.CreditCard,
                             onSelected: toggleVisibility,
                         },
-                        {
-                            text: 'PayPal.me',
-                            icon: Expensicons.PayPal,
-                            onSelected: toggleVisibility,
-                        },
                     ]}
                 />
             </SafeAreaProvider>
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.ts
similarity index 60%
rename from src/styles/StyleUtils.js
rename to src/styles/StyleUtils.ts
index 9dcf954e84fd..ec06bb07c3fe 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.ts
@@ -1,4 +1,7 @@
-import _ from 'underscore';
+import {EdgeInsets} from 'react-native-safe-area-context';
+import {Animated, PressableStateCallbackType, TextStyle, ViewStyle} from 'react-native';
+import {CSSProperties} from 'react';
+import {ValueOf} from 'type-fest';
 import CONST from '../CONST';
 import fontFamily from './fontFamily';
 import themeColors from './themes/default';
@@ -11,7 +14,57 @@ import * as UserUtils from '../libs/UserUtils';
 import * as Browser from '../libs/Browser';
 import cursor from './utilities/cursor';
 
-const workspaceColorOptions = [
+type ColorValue = ValueOf<typeof colors>;
+type AvatarSizeName = ValueOf<typeof CONST.AVATAR_SIZE>;
+type AvatarSizeValue = ValueOf<
+    Pick<
+        typeof variables,
+        | 'avatarSizeNormal'
+        | 'avatarSizeSmallSubscript'
+        | 'avatarSizeMidSubscript'
+        | 'avatarSizeSubscript'
+        | 'avatarSizeSmall'
+        | 'avatarSizeSmaller'
+        | 'avatarSizeLarge'
+        | 'avatarSizeMedium'
+        | 'avatarSizeLargeBordered'
+        | 'avatarSizeHeader'
+        | 'avatarSizeMentionIcon'
+        | 'avatarSizeSmallNormal'
+    >
+>;
+type ButtonSizeValue = ValueOf<typeof CONST.DROPDOWN_BUTTON_SIZE>;
+type EmptyAvatarSizeName = ValueOf<Pick<typeof CONST.AVATAR_SIZE, 'SMALL' | 'MEDIUM' | 'LARGE'>>;
+type ButtonStateName = ValueOf<typeof CONST.BUTTON_STATES>;
+type AvatarSize = {width: number};
+type ParsableStyle = ViewStyle | CSSProperties | ((state: PressableStateCallbackType) => ViewStyle | CSSProperties);
+
+type WorkspaceColorStyle = {backgroundColor: ColorValue; fill: ColorValue};
+
+type ModalPaddingStylesArgs = {
+    shouldAddBottomSafeAreaMargin: boolean;
+    shouldAddTopSafeAreaMargin: boolean;
+    shouldAddBottomSafeAreaPadding: boolean;
+    shouldAddTopSafeAreaPadding: boolean;
+    safeAreaPaddingTop: number;
+    safeAreaPaddingBottom: number;
+    safeAreaPaddingLeft: number;
+    safeAreaPaddingRight: number;
+    modalContainerStyleMarginTop: number;
+    modalContainerStyleMarginBottom: number;
+    modalContainerStylePaddingTop: number;
+    modalContainerStylePaddingBottom: number;
+    insets: EdgeInsets;
+};
+
+type AvatarBorderStyleArgs = {
+    isHovered: boolean;
+    isPressed: boolean;
+    isInReportAction: boolean;
+    shouldUseCardBackground: boolean;
+};
+
+const workspaceColorOptions: WorkspaceColorStyle[] = [
     {backgroundColor: colors.blue200, fill: colors.blue700},
     {backgroundColor: colors.blue400, fill: colors.blue800},
     {backgroundColor: colors.blue700, fill: colors.blue200},
@@ -32,7 +85,7 @@ const workspaceColorOptions = [
     {backgroundColor: colors.ice700, fill: colors.ice200},
 ];
 
-const avatarBorderSizes = {
+const avatarBorderSizes: Partial<Record<AvatarSizeName, number>> = {
     [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: variables.componentBorderRadiusSmall,
     [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: variables.componentBorderRadiusSmall,
     [CONST.AVATAR_SIZE.SUBSCRIPT]: variables.componentBorderRadiusMedium,
@@ -46,7 +99,7 @@ const avatarBorderSizes = {
     [CONST.AVATAR_SIZE.SMALL_NORMAL]: variables.componentBorderRadiusMedium,
 };
 
-const avatarSizes = {
+const avatarSizes: Record<AvatarSizeName, AvatarSizeValue> = {
     [CONST.AVATAR_SIZE.DEFAULT]: variables.avatarSizeNormal,
     [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: variables.avatarSizeSmallSubscript,
     [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: variables.avatarSizeMidSubscript,
@@ -61,48 +114,61 @@ const avatarSizes = {
     [CONST.AVATAR_SIZE.SMALL_NORMAL]: variables.avatarSizeSmallNormal,
 };
 
-const emptyAvatarStyles = {
+const emptyAvatarStyles: Record<EmptyAvatarSizeName, ViewStyle | CSSProperties> = {
     [CONST.AVATAR_SIZE.SMALL]: styles.emptyAvatarSmall,
     [CONST.AVATAR_SIZE.MEDIUM]: styles.emptyAvatarMedium,
     [CONST.AVATAR_SIZE.LARGE]: styles.emptyAvatarLarge,
 };
 
+const avatarFontSizes: Partial<Record<AvatarSizeName, number>> = {
+    [CONST.AVATAR_SIZE.DEFAULT]: variables.fontSizeNormal,
+    [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: variables.fontSizeExtraSmall,
+    [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: variables.fontSizeExtraSmall,
+    [CONST.AVATAR_SIZE.SUBSCRIPT]: variables.fontSizeExtraSmall,
+    [CONST.AVATAR_SIZE.SMALL]: variables.fontSizeSmall,
+    [CONST.AVATAR_SIZE.SMALLER]: variables.fontSizeExtraSmall,
+    [CONST.AVATAR_SIZE.LARGE]: variables.fontSizeXLarge,
+    [CONST.AVATAR_SIZE.MEDIUM]: variables.fontSizeMedium,
+    [CONST.AVATAR_SIZE.LARGE_BORDERED]: variables.fontSizeXLarge,
+};
+
+const avatarBorderWidths: Partial<Record<AvatarSizeName, number>> = {
+    [CONST.AVATAR_SIZE.DEFAULT]: 3,
+    [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: 1,
+    [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: 2,
+    [CONST.AVATAR_SIZE.SUBSCRIPT]: 2,
+    [CONST.AVATAR_SIZE.SMALL]: 2,
+    [CONST.AVATAR_SIZE.SMALLER]: 2,
+    [CONST.AVATAR_SIZE.LARGE]: 4,
+    [CONST.AVATAR_SIZE.MEDIUM]: 3,
+    [CONST.AVATAR_SIZE.LARGE_BORDERED]: 4,
+};
+
 /**
  * Return the style size from an avatar size constant
- *
- * @param {String} size
- * @returns {Number}
  */
-function getAvatarSize(size) {
+function getAvatarSize(size: AvatarSizeName): number {
     return avatarSizes[size];
 }
 
 /**
  * Return the height of magic code input container
- *
- * @returns {Object}
  */
-function getHeightOfMagicCodeInput() {
+function getHeightOfMagicCodeInput(): ViewStyle | CSSProperties {
     return {height: styles.magicCodeInputContainer.minHeight - styles.textInputContainer.borderBottomWidth};
 }
 
 /**
  * Return the style from an empty avatar size constant
- *
- * @param {String} size
- * @returns {Object}
  */
-function getEmptyAvatarStyle(size) {
+function getEmptyAvatarStyle(size: EmptyAvatarSizeName): ViewStyle | CSSProperties | undefined {
     return emptyAvatarStyles[size];
 }
 
 /**
  * Return the width style from an avatar size constant
- *
- * @param {String} size
- * @returns {Object}
  */
-function getAvatarWidthStyle(size) {
+function getAvatarWidthStyle(size: AvatarSizeName): ViewStyle | CSSProperties {
     const avatarSize = getAvatarSize(size);
     return {
         width: avatarSize,
@@ -111,11 +177,8 @@ function getAvatarWidthStyle(size) {
 
 /**
  * Return the style from an avatar size constant
- *
- * @param {String} size
- * @returns {Object}
  */
-function getAvatarStyle(size) {
+function getAvatarStyle(size: AvatarSizeName): ViewStyle | CSSProperties {
     const avatarSize = getAvatarSize(size);
     return {
         height: avatarSize,
@@ -127,56 +190,26 @@ function getAvatarStyle(size) {
 
 /**
  * Get Font size of '+1' text on avatar overlay
- * @param {String} size
- * @returns {Object}
- */
-function getAvatarExtraFontSizeStyle(size) {
-    const AVATAR_SIZES = {
-        [CONST.AVATAR_SIZE.DEFAULT]: variables.fontSizeNormal,
-        [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: variables.fontSizeExtraSmall,
-        [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: variables.fontSizeExtraSmall,
-        [CONST.AVATAR_SIZE.SUBSCRIPT]: variables.fontSizeExtraSmall,
-        [CONST.AVATAR_SIZE.SMALL]: variables.fontSizeSmall,
-        [CONST.AVATAR_SIZE.SMALLER]: variables.fontSizeExtraSmall,
-        [CONST.AVATAR_SIZE.LARGE]: variables.fontSizeXLarge,
-        [CONST.AVATAR_SIZE.MEDIUM]: variables.fontSizeMedium,
-        [CONST.AVATAR_SIZE.LARGE_BORDERED]: variables.fontSizeXLarge,
-    };
+ */
+function getAvatarExtraFontSizeStyle(size: AvatarSizeName): TextStyle | CSSProperties {
     return {
-        fontSize: AVATAR_SIZES[size],
+        fontSize: avatarFontSizes[size],
     };
 }
 
 /**
  * Get Bordersize of Avatar based on avatar size
- * @param {String} size
- * @returns {Object}
- */
-function getAvatarBorderWidth(size) {
-    const AVATAR_SIZES = {
-        [CONST.AVATAR_SIZE.DEFAULT]: 3,
-        [CONST.AVATAR_SIZE.SMALL_SUBSCRIPT]: 1,
-        [CONST.AVATAR_SIZE.MID_SUBSCRIPT]: 2,
-        [CONST.AVATAR_SIZE.SUBSCRIPT]: 2,
-        [CONST.AVATAR_SIZE.SMALL]: 2,
-        [CONST.AVATAR_SIZE.SMALLER]: 2,
-        [CONST.AVATAR_SIZE.LARGE]: 4,
-        [CONST.AVATAR_SIZE.MEDIUM]: 3,
-        [CONST.AVATAR_SIZE.LARGE_BORDERED]: 4,
-    };
+ */
+function getAvatarBorderWidth(size: AvatarSizeName): ViewStyle | CSSProperties {
     return {
-        borderWidth: AVATAR_SIZES[size],
+        borderWidth: avatarBorderWidths[size],
     };
 }
 
 /**
  * Return the border radius for an avatar
- *
- * @param {String} size
- * @param {String} type
- * @returns {Object}
  */
-function getAvatarBorderRadius(size, type) {
+function getAvatarBorderRadius(size: AvatarSizeName, type: string): ViewStyle | CSSProperties {
     if (type === CONST.ICON_TYPE_WORKSPACE) {
         return {borderRadius: avatarBorderSizes[size]};
     }
@@ -187,12 +220,8 @@ function getAvatarBorderRadius(size, type) {
 
 /**
  * Return the border style for an avatar
- *
- * @param {String} size
- * @param {String} type
- * @returns {Object}
  */
-function getAvatarBorderStyle(size, type) {
+function getAvatarBorderStyle(size: AvatarSizeName, type: string): ViewStyle | CSSProperties {
     return {
         overflow: 'hidden',
         ...getAvatarBorderRadius(size, type),
@@ -201,11 +230,8 @@ function getAvatarBorderStyle(size, type) {
 
 /**
  * Helper method to return old dot default avatar associated with login
- *
- * @param {String} [workspaceName]
- * @returns {Object}
  */
-function getDefaultWorkspaceAvatarColor(workspaceName) {
+function getDefaultWorkspaceAvatarColor(workspaceName: string): ViewStyle | CSSProperties {
     const colorHash = UserUtils.hashText(workspaceName.trim(), workspaceColorOptions.length);
 
     return workspaceColorOptions[colorHash];
@@ -213,54 +239,43 @@ function getDefaultWorkspaceAvatarColor(workspaceName) {
 
 /**
  * Takes safe area insets and returns padding to use for a View
- *
- * @param {Object} insets
- * @param {Number} [insetsPercentage] - Percentage of the insets to use for sides and bottom padding
- * @returns {Object}
  */
-function getSafeAreaPadding(insets, insetsPercentage = variables.safeInsertPercentage) {
+function getSafeAreaPadding(insets?: EdgeInsets, insetsPercentage: number = variables.safeInsertPercentage): ViewStyle | CSSProperties {
     return {
-        paddingTop: insets.top,
-        paddingBottom: insets.bottom * insetsPercentage,
-        paddingLeft: insets.left * insetsPercentage,
-        paddingRight: insets.right * insetsPercentage,
+        paddingTop: insets?.top,
+        paddingBottom: (insets?.bottom ?? 0) * insetsPercentage,
+        paddingLeft: (insets?.left ?? 0) * insetsPercentage,
+        paddingRight: (insets?.right ?? 0) * insetsPercentage,
     };
 }
 
 /**
  * Takes safe area insets and returns margin to use for a View
- *
- * @param {Object} insets
- * @returns {Object}
  */
-function getSafeAreaMargins(insets) {
-    return {marginBottom: insets.bottom * variables.safeInsertPercentage};
+function getSafeAreaMargins(insets?: EdgeInsets): ViewStyle | CSSProperties {
+    return {marginBottom: (insets?.bottom ?? 0) * variables.safeInsertPercentage};
 }
 
-/**
- * @param {Boolean} isZoomed
- * @param {Boolean} isDragging
- * @return {Object}
- */
-function getZoomCursorStyle(isZoomed, isDragging) {
+function getZoomCursorStyle(isZoomed: boolean, isDragging: boolean): ViewStyle | CSSProperties {
     if (!isZoomed) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return styles.cursorZoomIn;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return isDragging ? styles.cursorGrabbing : styles.cursorZoomOut;
 }
 
-/**
- * @param {Boolean} isZoomed
- * @param {Number} imgWidth
- * @param {Number} imgHeight
- * @param {Number} zoomScale
- * @param {Number} containerHeight
- * @param {Number} containerWidth
- * @param {Boolean} isLoading
- * @returns {Object | undefined}
- */
-function getZoomSizingStyle(isZoomed, imgWidth, imgHeight, zoomScale, containerHeight, containerWidth, isLoading) {
+function getZoomSizingStyle(
+    isZoomed: boolean,
+    imgWidth: number,
+    imgHeight: number,
+    zoomScale: number,
+    containerHeight: number,
+    containerWidth: number,
+    isLoading: boolean,
+): ViewStyle | CSSProperties | undefined {
     // Hide image until finished loading to prevent showing preview with wrong dimensions
     if (isLoading || imgWidth === 0 || imgHeight === 0) {
         return undefined;
@@ -311,11 +326,8 @@ function getZoomSizingStyle(isZoomed, imgWidth, imgHeight, zoomScale, containerH
 
 /**
  * Returns auto grow text input style
- *
- * @param {Number} width
- * @return {Object}
  */
-function getWidthStyle(width) {
+function getWidthStyle(width: number): ViewStyle | CSSProperties {
     return {
         width,
     };
@@ -323,19 +335,19 @@ function getWidthStyle(width) {
 
 /**
  * Returns auto grow height text input style
- *
- * @param {Number} textInputHeight
- * @param {Number} maxHeight
- * @returns {Object}
  */
-function getAutoGrowHeightInputStyle(textInputHeight, maxHeight) {
+function getAutoGrowHeightInputStyle(textInputHeight: number, maxHeight: number): ViewStyle | CSSProperties {
     if (textInputHeight > maxHeight) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return {
             ...styles.pr0,
             ...styles.overflowAuto,
         };
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...styles.pr0,
         ...styles.overflowHidden,
@@ -347,11 +359,8 @@ function getAutoGrowHeightInputStyle(textInputHeight, maxHeight) {
 
 /**
  * Returns a style with backgroundColor and borderColor set to the same color
- *
- * @param {String} backgroundColor
- * @returns {Object}
  */
-function getBackgroundAndBorderStyle(backgroundColor) {
+function getBackgroundAndBorderStyle(backgroundColor: string): ViewStyle | CSSProperties {
     return {
         backgroundColor,
         borderColor: backgroundColor,
@@ -360,11 +369,8 @@ function getBackgroundAndBorderStyle(backgroundColor) {
 
 /**
  * Returns a style with the specified backgroundColor
- *
- * @param {String} backgroundColor
- * @returns {Object}
  */
-function getBackgroundColorStyle(backgroundColor) {
+function getBackgroundColorStyle(backgroundColor: string): ViewStyle | CSSProperties {
     return {
         backgroundColor,
     };
@@ -372,11 +378,8 @@ function getBackgroundColorStyle(backgroundColor) {
 
 /**
  * Returns a style for text color
- *
- * @param {String} color
- * @returns {Object}
  */
-function getTextColorStyle(color) {
+function getTextColorStyle(color: string): TextStyle | CSSProperties {
     return {
         color,
     };
@@ -384,11 +387,8 @@ function getTextColorStyle(color) {
 
 /**
  * Returns a style with the specified borderColor
- *
- * @param {String} borderColor
- * @returns {Object}
  */
-function getBorderColorStyle(borderColor) {
+function getBorderColorStyle(borderColor: string): ViewStyle | CSSProperties {
     return {
         borderColor,
     };
@@ -396,12 +396,8 @@ function getBorderColorStyle(borderColor) {
 
 /**
  * Returns the width style for the wordmark logo on the sign in page
- *
- * @param {String} environment
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
  */
-function getSignInWordmarkWidthStyle(environment, isSmallScreenWidth) {
+function getSignInWordmarkWidthStyle(environment: string, isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (environment === CONST.ENVIRONMENT.DEV) {
         return isSmallScreenWidth ? {width: variables.signInLogoWidthPill} : {width: variables.signInLogoWidthLargeScreenPill};
     }
@@ -417,27 +413,23 @@ function getSignInWordmarkWidthStyle(environment, isSmallScreenWidth) {
 /**
  * Converts a color in hexadecimal notation into RGB notation.
  *
- * @param {String} hexadecimal A color in hexadecimal notation.
- * @returns {Array} `undefined` if the input color is not in hexadecimal notation. Otherwise, the RGB components of the input color.
+ * @param hexadecimal A color in hexadecimal notation.
+ * @returns `undefined` if the input color is not in hexadecimal notation. Otherwise, the RGB components of the input color.
  */
-function hexadecimalToRGBArray(hexadecimal) {
+function hexadecimalToRGBArray(hexadecimal: string): number[] | undefined {
     const components = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hexadecimal);
 
     if (components === null) {
         return undefined;
     }
 
-    return _.map(components.slice(1), (component) => parseInt(component, 16));
+    return components.slice(1).map((component) => parseInt(component, 16));
 }
 
 /**
  * Returns a background color with opacity style
- *
- * @param {String} backgroundColor
- * @param {number} opacity
- * @returns {Object}
  */
-function getBackgroundColorWithOpacityStyle(backgroundColor, opacity) {
+function getBackgroundColorWithOpacityStyle(backgroundColor: string, opacity: number): ViewStyle | CSSProperties {
     const result = hexadecimalToRGBArray(backgroundColor);
     if (result !== undefined) {
         return {
@@ -449,21 +441,21 @@ function getBackgroundColorWithOpacityStyle(backgroundColor, opacity) {
 
 /**
  * Generate a style for the background color of the Badge
- *
- * @param {Boolean} success
- * @param {Boolean} error
- * @param {boolean} [isPressed=false]
- * @param {boolean} [isAdHoc=false]
- * @return {Object}
  */
-function getBadgeColorStyle(success, error, isPressed = false, isAdHoc = false) {
+function getBadgeColorStyle(success: boolean, error: boolean, isPressed = false, isAdHoc = false): ViewStyle | CSSProperties {
     if (success) {
         if (isAdHoc) {
+            // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return isPressed ? styles.badgeAdHocSuccessPressed : styles.badgeAdHocSuccess;
         }
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return isPressed ? styles.badgeSuccessPressed : styles.badgeSuccess;
     }
     if (error) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return isPressed ? styles.badgeDangerPressed : styles.badgeDanger;
     }
     return {};
@@ -472,11 +464,10 @@ function getBadgeColorStyle(success, error, isPressed = false, isAdHoc = false)
 /**
  * Generate a style for the background color of the button, based on its current state.
  *
- * @param {String} [buttonState] - One of {'default', 'hovered', 'pressed'}
- * @param {Boolean} isMenuItem - whether this button is apart of a list
- * @returns {Object}
+ * @param buttonState - One of {'default', 'hovered', 'pressed'}
+ * @param isMenuItem - whether this button is apart of a list
  */
-function getButtonBackgroundColorStyle(buttonState = CONST.BUTTON_STATES.DEFAULT, isMenuItem = false) {
+function getButtonBackgroundColorStyle(buttonState: ButtonStateName = CONST.BUTTON_STATES.DEFAULT, isMenuItem = false): ViewStyle | CSSProperties {
     switch (buttonState) {
         case CONST.BUTTON_STATES.PRESSED:
             return {backgroundColor: themeColors.buttonPressedBG};
@@ -492,11 +483,10 @@ function getButtonBackgroundColorStyle(buttonState = CONST.BUTTON_STATES.DEFAULT
 /**
  * Generate fill color of an icon based on its state.
  *
- * @param {String} [buttonState] - One of {'default', 'hovered', 'pressed'}
- * @param {Boolean} isMenuIcon - whether this icon is apart of a list
- * @returns {Object}
+ * @param buttonState - One of {'default', 'hovered', 'pressed'}
+ * @param isMenuIcon - whether this icon is apart of a list
  */
-function getIconFillColor(buttonState = CONST.BUTTON_STATES.DEFAULT, isMenuIcon = false) {
+function getIconFillColor(buttonState: ButtonStateName = CONST.BUTTON_STATES.DEFAULT, isMenuIcon = false): string {
     switch (buttonState) {
         case CONST.BUTTON_STATES.ACTIVE:
         case CONST.BUTTON_STATES.PRESSED:
@@ -513,34 +503,20 @@ function getIconFillColor(buttonState = CONST.BUTTON_STATES.DEFAULT, isMenuIcon
     }
 }
 
-/**
- * @param {Animated.Value} rotate
- * @param {Animated.Value} backgroundColor
- * @returns {Object}
- */
-function getAnimatedFABStyle(rotate, backgroundColor) {
+function getAnimatedFABStyle(rotate: Animated.Value, backgroundColor: Animated.Value): Animated.WithAnimatedValue<ViewStyle> {
     return {
         transform: [{rotate}],
         backgroundColor,
     };
 }
 
-/**
- * @param {Number} width
- * @param {Number | null} height
- * @returns {Object}
- */
-function getWidthAndHeightStyle(width, height = null) {
+function getWidthAndHeightStyle(width: number, height: number | undefined = undefined): ViewStyle | CSSProperties {
     return {
         width,
-        height: height != null ? height : width,
+        height: height ?? width,
     };
 }
 
-/**
- * @param {Object} params
- * @returns {Object}
- */
 function getModalPaddingStyles({
     shouldAddBottomSafeAreaMargin,
     shouldAddTopSafeAreaMargin,
@@ -555,7 +531,7 @@ function getModalPaddingStyles({
     modalContainerStylePaddingTop,
     modalContainerStylePaddingBottom,
     insets,
-}) {
+}: ModalPaddingStylesArgs): ViewStyle | CSSProperties {
     // use fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
     // More info: issue #17376
     const safeAreaPaddingBottomWithFallback = insets.bottom === 0 ? modalContainerStylePaddingTop || 0 : safeAreaPaddingBottom;
@@ -571,11 +547,8 @@ function getModalPaddingStyles({
 
 /**
  * Takes fontStyle and fontWeight and returns the correct fontFamily
- *
- * @param {Object} params
- * @returns {String}
  */
-function getFontFamilyMonospace({fontStyle, fontWeight}) {
+function getFontFamilyMonospace({fontStyle, fontWeight}: TextStyle): string {
     const italic = fontStyle === 'italic' && fontFamily.MONOSPACE_ITALIC;
     const bold = fontWeight === 'bold' && fontFamily.MONOSPACE_BOLD;
     const italicBold = italic && bold && fontFamily.MONOSPACE_BOLD_ITALIC;
@@ -585,11 +558,8 @@ function getFontFamilyMonospace({fontStyle, fontWeight}) {
 
 /**
  * Gives the width for Emoji picker Widget
- *
- * @param {Boolean} isSmallScreenWidth
- * @returns {String}
  */
-function getEmojiPickerStyle(isSmallScreenWidth) {
+function getEmojiPickerStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (isSmallScreenWidth) {
         return {
             width: CONST.SMALL_EMOJI_PICKER_SIZE.WIDTH,
@@ -601,53 +571,19 @@ function getEmojiPickerStyle(isSmallScreenWidth) {
     };
 }
 
-/**
- * Get the random promo color and image for Login page
- *
- * @return {Object}
- */
-function getLoginPagePromoStyle() {
-    const promos = [
-        {
-            backgroundColor: colors.green,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_green.svg`,
-        },
-        {
-            backgroundColor: colors.orange,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_orange.svg`,
-        },
-        {
-            backgroundColor: colors.pink,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_pink.svg`,
-        },
-        {
-            backgroundColor: colors.blue,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_blue.svg`,
-        },
-        {
-            backgroundColor: colors.ivory,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/cpa-card.svg`,
-            redirectUri: `${CONST.USE_EXPENSIFY_URL}/accountants`,
-        },
-    ];
-    return promos[_.random(0, 4)];
-}
-
 /**
  * Generate the styles for the ReportActionItem wrapper view.
- *
- * @param {Boolean} [isHovered]
- * @param {Boolean} [isLoading]
- * @returns {Object}
  */
-function getReportActionItemStyle(isHovered = false, isLoading = false) {
+function getReportActionItemStyle(isHovered = false, isLoading = false): ViewStyle | CSSProperties {
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         display: 'flex',
         justifyContent: 'space-between',
         backgroundColor: isHovered
             ? themeColors.hoverComponentBG
             : // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
-              colors.transparent,
+              themeColors.transparent,
         opacity: isLoading ? 0.5 : 1,
         ...styles.cursorInitial,
     };
@@ -655,11 +591,10 @@ function getReportActionItemStyle(isHovered = false, isLoading = false) {
 
 /**
  * Generate the wrapper styles for the mini ReportActionContextMenu.
- *
- * @param {Boolean} isReportActionItemGrouped
- * @returns {Object}
  */
-function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped) {
+function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped: boolean): ViewStyle | CSSProperties {
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...(isReportActionItemGrouped ? positioning.tn8 : positioning.tn4),
         ...positioning.r4,
@@ -669,11 +604,7 @@ function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped) {
     };
 }
 
-/**
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
- */
-function getPaymentMethodMenuWidth(isSmallScreenWidth) {
+function getPaymentMethodMenuWidth(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     const margin = 20;
     return {width: !isSmallScreenWidth ? variables.sideBarWidth - margin * 2 : undefined};
 }
@@ -681,12 +612,12 @@ function getPaymentMethodMenuWidth(isSmallScreenWidth) {
 /**
  * Converts a color in RGBA notation to an equivalent color in RGB notation.
  *
- * @param {Array} foregroundRGB The three components of the foreground color in RGB notation.
- * @param {Array} backgroundRGB The three components of the background color in RGB notation.
- * @param {number} opacity The desired opacity of the foreground color.
- * @returns {Array} The RGB components of the RGBA color converted to RGB.
+ * @param foregroundRGB The three components of the foreground color in RGB notation.
+ * @param backgroundRGB The three components of the background color in RGB notation.
+ * @param opacity The desired opacity of the foreground color.
+ * @returns The RGB components of the RGBA color converted to RGB.
  */
-function convertRGBAToRGB(foregroundRGB, backgroundRGB, opacity) {
+function convertRGBAToRGB(foregroundRGB: number[], backgroundRGB: number[], opacity: number): number[] {
     const [foregroundRed, foregroundGreen, foregroundBlue] = foregroundRGB;
     const [backgroundRed, backgroundGreen, backgroundBlue] = backgroundRGB;
 
@@ -696,35 +627,36 @@ function convertRGBAToRGB(foregroundRGB, backgroundRGB, opacity) {
 /**
  * Converts three unit values to the three components of a color in RGB notation.
  *
- * @param {number} red A unit value representing the first component of a color in RGB notation.
- * @param {number} green A unit value representing the second component of a color in RGB notation.
- * @param {number} blue A unit value representing the third component of a color in RGB notation.
- * @returns {Array} An array with the three components of a color in RGB notation.
+ * @param red A unit value representing the first component of a color in RGB notation.
+ * @param green A unit value representing the second component of a color in RGB notation.
+ * @param blue A unit value representing the third component of a color in RGB notation.
+ * @returns An array with the three components of a color in RGB notation.
  */
-function convertUnitValuesToRGB(red, green, blue) {
+function convertUnitValuesToRGB(red: number, green: number, blue: number): number[] {
     return [Math.floor(red * 255), Math.floor(green * 255), Math.floor(blue * 255)];
 }
 
 /**
  * Converts the three components of a color in RGB notation to three unit values.
  *
- * @param {number} red The first component of a color in RGB notation.
- * @param {number} green The second component of a color in RGB notation.
- * @param {number} blue The third component of a color in RGB notation.
- * @returns {Array} An array with three unit values representing the components of a color in RGB notation.
+ * @param red The first component of a color in RGB notation.
+ * @param green The second component of a color in RGB notation.
+ * @param blue The third component of a color in RGB notation.
+ * @returns An array with three unit values representing the components of a color in RGB notation.
  */
-function convertRGBToUnitValues(red, green, blue) {
+function convertRGBToUnitValues(red: number, green: number, blue: number): number[] {
     return [red / 255, green / 255, blue / 255];
 }
 
 /**
  * Matches an RGBA or RGB color value and extracts the color components.
  *
- * @param {string} color - The RGBA or RGB color value to match and extract components from.
- * @returns {Array} An array containing the extracted color components [red, green, blue, alpha].
+ * @param color - The RGBA or RGB color value to match and extract components from.
+ * @returns An array containing the extracted color components [red, green, blue, alpha].
+ *
  * Returns null if the input string does not match the pattern.
  */
-function extractValuesFromRGB(color) {
+function extractValuesFromRGB(color: string): number[] | null {
     const rgbaPattern = /rgba?\((?<r>[.\d]+)[, ]+(?<g>[.\d]+)[, ]+(?<b>[.\d]+)(?:\s?[,/]\s?(?<a>[.\d]+%?))?\)$/i;
     const matchRGBA = color.match(rgbaPattern);
     if (matchRGBA) {
@@ -739,50 +671,43 @@ function extractValuesFromRGB(color) {
  * Determines the theme color for a modal based on the app's background color,
  * the modal's backdrop, and the backdrop's opacity.
  *
- * @param {String} bgColor - theme background color
- * @returns {String} The theme color as an RGB value.
+ * @param bgColor - theme background color
+ * @returns The theme color as an RGB value.
  */
-function getThemeBackgroundColor(bgColor = themeColors.appBG) {
+function getThemeBackgroundColor(bgColor: string = themeColors.appBG): string {
     const backdropOpacity = variables.modalFullscreenBackdropOpacity;
 
-    const [backgroundRed, backgroundGreen, backgroundBlue] = extractValuesFromRGB(bgColor) || hexadecimalToRGBArray(bgColor);
-    const [backdropRed, backdropGreen, backdropBlue] = hexadecimalToRGBArray(themeColors.modalBackdrop);
+    const [backgroundRed, backgroundGreen, backgroundBlue] = extractValuesFromRGB(bgColor) ?? hexadecimalToRGBArray(bgColor) ?? [];
+    const [backdropRed, backdropGreen, backdropBlue] = hexadecimalToRGBArray(themeColors.modalBackdrop) ?? [];
     const normalizedBackdropRGB = convertRGBToUnitValues(backdropRed, backdropGreen, backdropBlue);
     const normalizedBackgroundRGB = convertRGBToUnitValues(backgroundRed, backgroundGreen, backgroundBlue);
-    const themeRGBNormalized = convertRGBAToRGB(normalizedBackdropRGB, normalizedBackgroundRGB, backdropOpacity);
-    const themeRGB = convertUnitValuesToRGB(...themeRGBNormalized);
+    const [red, green, blue] = convertRGBAToRGB(normalizedBackdropRGB, normalizedBackgroundRGB, backdropOpacity);
+    const themeRGB = convertUnitValuesToRGB(red, green, blue);
 
     return `rgb(${themeRGB.join(', ')})`;
 }
 
 /**
  * Parse styleParam and return Styles array
- * @param {Object|Object[]} styleParam
- * @returns {Object[]}
  */
-function parseStyleAsArray(styleParam) {
-    return _.isArray(styleParam) ? styleParam : [styleParam];
+function parseStyleAsArray(styleParam: ViewStyle | CSSProperties | Array<ViewStyle | CSSProperties>): Array<ViewStyle | CSSProperties> {
+    return Array.isArray(styleParam) ? styleParam : [styleParam];
 }
 
 /**
  * Parse style function and return Styles object
- * @param {Object|Object[]|Function} style
- * @param {Object} state
- * @returns {Object[]}
  */
-function parseStyleFromFunction(style, state) {
-    const functionAppliedStyle = _.isFunction(style) ? style(state) : style;
+function parseStyleFromFunction(style: ParsableStyle, state: PressableStateCallbackType): Array<ViewStyle | CSSProperties> {
+    const functionAppliedStyle = typeof style === 'function' ? style(state) : style;
     return parseStyleAsArray(functionAppliedStyle);
 }
 
 /**
  * Receives any number of object or array style objects and returns them all as an array
- * @param {Object|Object[]} allStyles
- * @return {Object[]}
  */
-function combineStyles(...allStyles) {
-    let finalStyles = [];
-    _.each(allStyles, (style) => {
+function combineStyles(...allStyles: Array<ViewStyle | CSSProperties | Array<ViewStyle | CSSProperties>>) {
+    let finalStyles: Array<Array<ViewStyle | CSSProperties>> = [];
+    allStyles.forEach((style) => {
         finalStyles = finalStyles.concat(parseStyleAsArray(style));
     });
     return finalStyles;
@@ -790,10 +715,8 @@ function combineStyles(...allStyles) {
 
 /**
  * Get variable padding-left as style
- * @param {Number} paddingLeft
- * @returns {Object}
  */
-function getPaddingLeft(paddingLeft) {
+function getPaddingLeft(paddingLeft: number): ViewStyle | CSSProperties {
     return {
         paddingLeft,
     };
@@ -801,22 +724,16 @@ function getPaddingLeft(paddingLeft) {
 
 /**
  * Checks to see if the iOS device has safe areas or not
- *
- * @param {Number} windowWidth
- * @param {Number} windowHeight
- * @returns {Boolean}
  */
-function hasSafeAreas(windowWidth, windowHeight) {
+function hasSafeAreas(windowWidth: number, windowHeight: number): boolean {
     const heightsIphonesWithNotches = [812, 896, 844, 926];
-    return _.contains(heightsIphonesWithNotches, windowHeight) || _.contains(heightsIphonesWithNotches, windowWidth);
+    return heightsIphonesWithNotches.includes(windowHeight) || heightsIphonesWithNotches.includes(windowWidth);
 }
 
 /**
  * Get height as style
- * @param {Number} height
- * @returns {Object}
  */
-function getHeight(height) {
+function getHeight(height: number): ViewStyle | CSSProperties {
     return {
         height,
     };
@@ -824,21 +741,26 @@ function getHeight(height) {
 
 /**
  * Get minimum height as style
- * @param {Number} minHeight
- * @returns {Object}
  */
-function getMinimumHeight(minHeight) {
+function getMinimumHeight(minHeight: number): ViewStyle | CSSProperties {
     return {
         minHeight,
     };
 }
 
+/**
+ * Get maximum height as style
+ */
+function getMaximumHeight(maxHeight: number): ViewStyle | CSSProperties {
+    return {
+        maxHeight,
+    };
+}
+
 /**
  * Get maximum width as style
- * @param {Number} maxWidth
- * @returns {Object}
  */
-function getMaximumWidth(maxWidth) {
+function getMaximumWidth(maxWidth: number): ViewStyle | CSSProperties {
     return {
         maxWidth,
     };
@@ -846,11 +768,8 @@ function getMaximumWidth(maxWidth) {
 
 /**
  * Return style for opacity animation.
- *
- * @param {Animated.Value} fadeAnimation
- * @returns {Object}
  */
-function fade(fadeAnimation) {
+function fade(fadeAnimation: Animated.Value): Animated.WithAnimatedValue<ViewStyle> {
     return {
         opacity: fadeAnimation,
     };
@@ -858,26 +777,15 @@ function fade(fadeAnimation) {
 
 /**
  * Return width for keyboard shortcuts modal.
- *
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
  */
-function getKeyboardShortcutsModalWidth(isSmallScreenWidth) {
+function getKeyboardShortcutsModalWidth(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (isSmallScreenWidth) {
         return {maxWidth: '100%'};
     }
     return {maxWidth: 600};
 }
 
-/**
- * @param {Object} params
- * @param {Boolean} params.isHovered
- * @param {Boolean} params.isPressed
- * @param {Boolean} params.isInReportAction
- * @param {Boolean} params.shouldUseCardBackground
- * @returns {Object}
- */
-function getHorizontalStackedAvatarBorderStyle({isHovered, isPressed, isInReportAction = false, shouldUseCardBackground = false}) {
+function getHorizontalStackedAvatarBorderStyle({isHovered, isPressed, isInReportAction = false, shouldUseCardBackground = false}: AvatarBorderStyleArgs): ViewStyle | CSSProperties {
     let borderColor = shouldUseCardBackground ? themeColors.cardBG : themeColors.appBG;
 
     if (isHovered) {
@@ -893,13 +801,8 @@ function getHorizontalStackedAvatarBorderStyle({isHovered, isPressed, isInReport
 
 /**
  * Get computed avatar styles based on position and border size
- * @param {Number} index
- * @param {Number} overlapSize
- * @param {Number} borderWidth
- * @param {Number} borderRadius
- * @returns {Object}
  */
-function getHorizontalStackedAvatarStyle(index, overlapSize) {
+function getHorizontalStackedAvatarStyle(index: number, overlapSize: number): ViewStyle | CSSProperties {
     return {
         marginLeft: index > 0 ? -overlapSize : 0,
         zIndex: index + 2,
@@ -908,11 +811,8 @@ function getHorizontalStackedAvatarStyle(index, overlapSize) {
 
 /**
  * Get computed avatar styles of '+1' overlay based on size
- * @param {Object} oneAvatarSize
- * @param {Numer} oneAvatarBorderWidth
- * @returns {Object}
  */
-function getHorizontalStackedOverlayAvatarStyle(oneAvatarSize, oneAvatarBorderWidth) {
+function getHorizontalStackedOverlayAvatarStyle(oneAvatarSize: AvatarSize, oneAvatarBorderWidth: number): ViewStyle | CSSProperties {
     return {
         borderWidth: oneAvatarBorderWidth,
         borderRadius: oneAvatarSize.width,
@@ -922,11 +822,7 @@ function getHorizontalStackedOverlayAvatarStyle(oneAvatarSize, oneAvatarBorderWi
     };
 }
 
-/**
- * @param {Number} safeAreaPaddingBottom
- * @returns {Object}
- */
-function getErrorPageContainerStyle(safeAreaPaddingBottom = 0) {
+function getErrorPageContainerStyle(safeAreaPaddingBottom = 0): ViewStyle | CSSProperties {
     return {
         backgroundColor: themeColors.componentBG,
         paddingBottom: 40 + safeAreaPaddingBottom,
@@ -935,11 +831,8 @@ function getErrorPageContainerStyle(safeAreaPaddingBottom = 0) {
 
 /**
  * Gets the correct size for the empty state background image based on screen dimensions
- *
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
  */
-function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth) {
+function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (isSmallScreenWidth) {
         return {
             height: CONST.EMPTY_STATE_BACKGROUND.SMALL_SCREEN.IMAGE_HEIGHT,
@@ -957,11 +850,8 @@ function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth) {
 
 /**
  * Gets the correct top margin size for the chat welcome message based on screen dimensions
- *
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
  */
-function getReportWelcomeTopMarginStyle(isSmallScreenWidth) {
+function getReportWelcomeTopMarginStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (isSmallScreenWidth) {
         return {
             marginTop: CONST.EMPTY_STATE_BACKGROUND.SMALL_SCREEN.VIEW_HEIGHT,
@@ -975,11 +865,8 @@ function getReportWelcomeTopMarginStyle(isSmallScreenWidth) {
 
 /**
  * Returns fontSize style
- *
- * @param {Number} fontSize
- * @returns {Object}
  */
-function getFontSizeStyle(fontSize) {
+function getFontSizeStyle(fontSize: number): TextStyle | CSSProperties {
     return {
         fontSize,
     };
@@ -987,11 +874,8 @@ function getFontSizeStyle(fontSize) {
 
 /**
  * Returns lineHeight style
- *
- * @param {Number} lineHeight
- * @returns {Object}
  */
-function getLineHeightStyle(lineHeight) {
+function getLineHeightStyle(lineHeight: number): TextStyle | CSSProperties {
     return {
         lineHeight,
     };
@@ -999,11 +883,8 @@ function getLineHeightStyle(lineHeight) {
 
 /**
  * Gets the correct size for the empty state container based on screen dimensions
- *
- * @param {Boolean} isSmallScreenWidth
- * @returns {Object}
  */
-function getReportWelcomeContainerStyle(isSmallScreenWidth) {
+function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     if (isSmallScreenWidth) {
         return {
             minHeight: CONST.EMPTY_STATE_BACKGROUND.SMALL_SCREEN.CONTAINER_MINHEIGHT,
@@ -1021,14 +902,8 @@ function getReportWelcomeContainerStyle(isSmallScreenWidth) {
 
 /**
  * Gets styles for AutoCompleteSuggestion row
- *
- * @param {Number} highlightedEmojiIndex
- * @param {Number} rowHeight
- * @param {Boolean} hovered
- * @param {Number} currentEmojiIndex
- * @returns {Object}
  */
-function getAutoCompleteSuggestionItemStyle(highlightedEmojiIndex, rowHeight, hovered, currentEmojiIndex) {
+function getAutoCompleteSuggestionItemStyle(highlightedEmojiIndex: number, rowHeight: number, hovered: boolean, currentEmojiIndex: number): Array<ViewStyle | CSSProperties> {
     let backgroundColor;
 
     if (currentEmojiIndex === highlightedEmojiIndex) {
@@ -1052,23 +927,15 @@ function getAutoCompleteSuggestionItemStyle(highlightedEmojiIndex, rowHeight, ho
 
 /**
  * Gets the correct position for the base auto complete suggestion container
- *
- * @param {Object} parentContainerLayout
- * @returns {Object}
  */
-
-function getBaseAutoCompleteSuggestionContainerStyle({left, bottom, width}) {
+function getBaseAutoCompleteSuggestionContainerStyle({left, bottom, width}: {left: number; bottom: number; width: number}): ViewStyle | CSSProperties {
     return {position: 'fixed', bottom, left, width};
 }
 
 /**
  * Gets the correct position for auto complete suggestion container
- *
- * @param {Number} itemsHeight
- * @param {Boolean} shouldIncludeReportRecipientLocalTimeHeight
- * @returns {Object}
  */
-function getAutoCompleteSuggestionContainerStyle(itemsHeight, shouldIncludeReportRecipientLocalTimeHeight) {
+function getAutoCompleteSuggestionContainerStyle(itemsHeight: number, shouldIncludeReportRecipientLocalTimeHeight: boolean): ViewStyle | CSSProperties {
     'worklet';
 
     const optionalPadding = shouldIncludeReportRecipientLocalTimeHeight ? CONST.RECIPIENT_LOCAL_TIME_HEIGHT : 0;
@@ -1087,12 +954,12 @@ function getAutoCompleteSuggestionContainerStyle(itemsHeight, shouldIncludeRepor
 
 /**
  * Select the correct color for text.
- * @param {Boolean} isColored
- * @returns {String | null}
  */
-const getColoredBackgroundStyle = (isColored) => ({backgroundColor: isColored ? colors.blueLink : null});
+function getColoredBackgroundStyle(isColored: boolean): ViewStyle | CSSProperties {
+    return {backgroundColor: isColored ? themeColors.link : undefined};
+}
 
-function getEmojiReactionBubbleStyle(isHovered, hasUserReacted, isContextMenu = false) {
+function getEmojiReactionBubbleStyle(isHovered: boolean, hasUserReacted: boolean, isContextMenu = false): ViewStyle | CSSProperties {
     let backgroundColor = themeColors.border;
 
     if (isHovered) {
@@ -1118,7 +985,7 @@ function getEmojiReactionBubbleStyle(isHovered, hasUserReacted, isContextMenu =
     };
 }
 
-function getEmojiReactionBubbleTextStyle(isContextMenu = false) {
+function getEmojiReactionBubbleTextStyle(isContextMenu = false): TextStyle | CSSProperties {
     if (isContextMenu) {
         return {
             fontSize: 17,
@@ -1132,21 +999,20 @@ function getEmojiReactionBubbleTextStyle(isContextMenu = false) {
     };
 }
 
-function getEmojiReactionCounterTextStyle(hasUserReacted) {
+function getEmojiReactionCounterTextStyle(hasUserReacted: boolean): TextStyle | CSSProperties {
     if (hasUserReacted) {
         return {color: themeColors.reactionActiveText};
     }
 
-    return {color: themeColors.textLight};
+    return {color: themeColors.text};
 }
 
 /**
  * Returns a style object with a rotation transformation applied based on the provided direction prop.
  *
- * @param {string} direction - The direction of the rotation (CONST.DIRECTION.LEFT or CONST.DIRECTION.RIGHT).
- * @returns {Object}
+ * @param direction - The direction of the rotation (CONST.DIRECTION.LEFT or CONST.DIRECTION.RIGHT).
  */
-function getDirectionStyle(direction) {
+function getDirectionStyle(direction: string): ViewStyle | CSSProperties {
     if (direction === CONST.DIRECTION.LEFT) {
         return {transform: [{rotate: '180deg'}]};
     }
@@ -1156,18 +1022,15 @@ function getDirectionStyle(direction) {
 
 /**
  * Returns a style object with display flex or none basing on the condition value.
- *
- * @param {boolean} condition
- * @returns {Object}
  */
-const displayIfTrue = (condition) => ({display: condition ? 'flex' : 'none'});
+function displayIfTrue(condition: boolean): ViewStyle | CSSProperties {
+    return {display: condition ? 'flex' : 'none'};
+}
 
-/**
- * @param {Boolean} shouldDisplayBorder
- * @returns {Object}
- */
-function getGoogleListViewStyle(shouldDisplayBorder) {
+function getGoogleListViewStyle(shouldDisplayBorder: boolean): ViewStyle | CSSProperties {
     if (shouldDisplayBorder) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return {
             ...styles.borderTopRounded,
             ...styles.borderBottomRounded,
@@ -1183,12 +1046,8 @@ function getGoogleListViewStyle(shouldDisplayBorder) {
 
 /**
  * Gets the correct height for emoji picker list based on screen dimensions
- *
- * @param {Boolean} hasAdditionalSpace
- * @param {Number} windowHeight
- * @returns {Object}
  */
-function getEmojiPickerListHeight(hasAdditionalSpace, windowHeight) {
+function getEmojiPickerListHeight(hasAdditionalSpace: boolean, windowHeight: number): ViewStyle | CSSProperties {
     const style = {
         ...spacing.ph4,
         height: hasAdditionalSpace ? CONST.NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT + CONST.CATEGORY_SHORTCUT_BAR_HEIGHT : CONST.NON_NATIVE_EMOJI_PICKER_LIST_HEIGHT,
@@ -1207,10 +1066,8 @@ function getEmojiPickerListHeight(hasAdditionalSpace, windowHeight) {
 
 /**
  * Returns style object for the user mention component based on whether the mention is ours or not.
- * @param {Boolean} isOurMention
- * @returns {Object}
  */
-function getMentionStyle(isOurMention) {
+function getMentionStyle(isOurMention: boolean): ViewStyle | CSSProperties {
     const backgroundColor = isOurMention ? themeColors.ourMentionBG : themeColors.mentionBG;
     return {
         backgroundColor,
@@ -1221,23 +1078,26 @@ function getMentionStyle(isOurMention) {
 
 /**
  * Returns text color for the user mention text based on whether the mention is ours or not.
- * @param {Boolean} isOurMention
- * @returns {Object}
  */
-function getMentionTextColor(isOurMention) {
+function getMentionTextColor(isOurMention: boolean): string {
     return isOurMention ? themeColors.ourMentionText : themeColors.mentionText;
 }
 
 /**
  * Returns padding vertical based on number of lines
- * @param {Number} numberOfLines
- * @returns {Object}
  */
-function getComposeTextAreaPadding(numberOfLines) {
+function getComposeTextAreaPadding(numberOfLines: number, isComposerFullSize: boolean): ViewStyle | CSSProperties {
     let paddingValue = 5;
-    if (numberOfLines === 1) paddingValue = 9;
-    // In case numberOfLines = 3, there will be a Expand Icon appearing at the top left, so it has to be recalculated so that the textArea can be full height
-    if (numberOfLines === 3) paddingValue = 8;
+    // Issue #26222: If isComposerFullSize paddingValue will always be 5 to prevent padding jumps when adding multiple lines.
+    if (!isComposerFullSize) {
+        if (numberOfLines === 1) {
+            paddingValue = 9;
+        }
+        // In case numberOfLines = 3, there will be a Expand Icon appearing at the top left, so it has to be recalculated so that the textArea can be full height
+        else if (numberOfLines === 3) {
+            paddingValue = 8;
+        }
+    }
     return {
         paddingTop: paddingValue,
         paddingBottom: paddingValue,
@@ -1246,20 +1106,15 @@ function getComposeTextAreaPadding(numberOfLines) {
 
 /**
  * Returns style object for the mobile on WEB
- * @param {Number} windowHeight
- * @param {Number} viewportOffsetTop
- * @returns {Object}
  */
-function getOuterModalStyle(windowHeight, viewportOffsetTop) {
+function getOuterModalStyle(windowHeight: number, viewportOffsetTop: number): ViewStyle | CSSProperties {
     return Browser.isMobile() ? {maxHeight: windowHeight, marginTop: viewportOffsetTop} : {};
 }
 
 /**
  * Returns style object for flexWrap depending on the screen size
- * @param {Boolean} isExtraSmallScreenWidth
- * @return {Object}
  */
-function getWrappingStyle(isExtraSmallScreenWidth) {
+function getWrappingStyle(isExtraSmallScreenWidth: boolean): ViewStyle | CSSProperties {
     return {
         flexWrap: isExtraSmallScreenWidth ? 'wrap' : 'nowrap',
     };
@@ -1267,10 +1122,8 @@ function getWrappingStyle(isExtraSmallScreenWidth) {
 
 /**
  * Returns the text container styles for menu items depending on if the menu item container a small avatar
- * @param {Boolean} isSmallAvatarSubscriptMenu
- * @returns {Number}
  */
-function getMenuItemTextContainerStyle(isSmallAvatarSubscriptMenu) {
+function getMenuItemTextContainerStyle(isSmallAvatarSubscriptMenu: boolean): ViewStyle | CSSProperties {
     return {
         minHeight: isSmallAvatarSubscriptMenu ? variables.avatarSizeSubscript : variables.componentSizeNormal,
     };
@@ -1278,15 +1131,15 @@ function getMenuItemTextContainerStyle(isSmallAvatarSubscriptMenu) {
 
 /**
  * Returns link styles based on whether the link is disabled or not
- * @param {Boolean} isDisabled
- * @returns {Object}
  */
-function getDisabledLinkStyles(isDisabled = false) {
+function getDisabledLinkStyles(isDisabled = false): ViewStyle | CSSProperties {
     const disabledLinkStyles = {
         color: themeColors.textSupporting,
         ...cursor.cursorDisabled,
     };
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...styles.link,
         ...(isDisabled ? disabledLinkStyles : {}),
@@ -1295,11 +1148,8 @@ function getDisabledLinkStyles(isDisabled = false) {
 
 /**
  * Returns the checkbox container style
- * @param {Number} size
- * @param {Number} borderRadius
- * @returns {Object}
  */
-function getCheckboxContainerStyle(size, borderRadius) {
+function getCheckboxContainerStyle(size: number, borderRadius: number): ViewStyle | CSSProperties {
     return {
         backgroundColor: themeColors.componentBG,
         height: size,
@@ -1315,10 +1165,8 @@ function getCheckboxContainerStyle(size, borderRadius) {
 
 /**
  * Returns style object for the dropbutton height
- * @param {String} buttonSize
- * @returns {Object}
  */
-function getDropDownButtonHeight(buttonSize) {
+function getDropDownButtonHeight(buttonSize: ButtonSizeValue): ViewStyle | CSSProperties {
     if (buttonSize === CONST.DROPDOWN_BUTTON_SIZE.LARGE) {
         return {
             height: variables.componentSizeLarge,
@@ -1329,6 +1177,42 @@ function getDropDownButtonHeight(buttonSize) {
     };
 }
 
+/**
+ * Returns fitting fontSize and lineHeight values in order to prevent large amounts from being cut off on small screen widths.
+ */
+function getAmountFontSizeAndLineHeight(baseFontSize: number, baseLineHeight: number, isSmallScreenWidth: boolean, windowWidth: number): ViewStyle | CSSProperties {
+    let toSubtract = 0;
+
+    if (isSmallScreenWidth) {
+        const widthDifference = variables.mobileResponsiveWidthBreakpoint - windowWidth;
+        switch (true) {
+            case widthDifference > 450:
+                toSubtract = 11;
+                break;
+            case widthDifference > 400:
+                toSubtract = 8;
+                break;
+            case widthDifference > 350:
+                toSubtract = 4;
+                break;
+            default:
+                break;
+        }
+    }
+
+    return {
+        fontSize: baseFontSize - toSubtract,
+        lineHeight: baseLineHeight - toSubtract,
+    };
+}
+
+/**
+ * Get transparent color by setting alpha value 0 of the passed hex(#xxxxxx) color code
+ */
+function getTransparentColor(color: string) {
+    return `${color}00`;
+}
+
 export {
     getAvatarSize,
     getAvatarWidthStyle,
@@ -1357,7 +1241,6 @@ export {
     getModalPaddingStyles,
     getFontFamilyMonospace,
     getEmojiPickerStyle,
-    getLoginPagePromoStyle,
     getReportActionItemStyle,
     getMiniReportActionContextMenuWrapperStyle,
     getKeyboardShortcutsModalWidth,
@@ -1370,6 +1253,7 @@ export {
     hasSafeAreas,
     getHeight,
     getMinimumHeight,
+    getMaximumHeight,
     getMaximumWidth,
     fade,
     getHorizontalStackedAvatarBorderStyle,
@@ -1404,4 +1288,6 @@ export {
     getDisabledLinkStyles,
     getCheckboxContainerStyle,
     getDropDownButtonHeight,
+    getAmountFontSizeAndLineHeight,
+    getTransparentColor,
 };
diff --git a/src/styles/ThemeStylesProvider.js b/src/styles/ThemeStylesProvider.js
deleted file mode 100644
index 4653605fc079..000000000000
--- a/src/styles/ThemeStylesProvider.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint-disable react/jsx-props-no-spreading */
-import React, {useMemo} from 'react';
-import PropTypes from 'prop-types';
-import useTheme from './themes/useTheme';
-import StylesContext from './ThemeStylesContext';
-import defaultStyles from './styles';
-
-const propTypes = {
-    /** Rendered child component */
-    children: PropTypes.node.isRequired,
-};
-
-function ThemeStylesProvider(props) {
-    const theme = useTheme();
-
-    const appContentStyle = useMemo(
-        () => ({
-            ...defaultStyles.appContent,
-            backgroundColor: theme.appBG,
-        }),
-        [theme.appBG],
-    );
-
-    const styles = useMemo(
-        () => ({
-            ...defaultStyles,
-            appContent: appContentStyle,
-        }),
-        [appContentStyle],
-    );
-
-    return <StylesContext.Provider value={styles}>{props.children}</StylesContext.Provider>;
-}
-ThemeStylesProvider.propTypes = propTypes;
-ThemeStylesProvider.displayName = 'ThemeStylesProvider';
-
-export default ThemeStylesProvider;
diff --git a/src/styles/ThemeStylesProvider.tsx b/src/styles/ThemeStylesProvider.tsx
new file mode 100644
index 000000000000..d0db784ca8ca
--- /dev/null
+++ b/src/styles/ThemeStylesProvider.tsx
@@ -0,0 +1,24 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import React, {useMemo} from 'react';
+import useTheme from './themes/useTheme';
+import ThemeStylesContext from './ThemeStylesContext';
+// TODO: Rename this to "styles" once the app is migrated to theme switching hooks and HOCs
+import {stylesGenerator as stylesUntyped} from './styles';
+
+const styles = stylesUntyped as (theme: Record<string, string>) => Record<string, unknown>;
+
+type ThemeStylesProviderProps = {
+    children: React.ReactNode;
+};
+
+function ThemeStylesProvider({children}: ThemeStylesProviderProps) {
+    const theme = useTheme();
+
+    const themeStyles = useMemo(() => styles(theme), [theme]);
+
+    return <ThemeStylesContext.Provider value={themeStyles}>{children}</ThemeStylesContext.Provider>;
+}
+
+ThemeStylesProvider.displayName = 'ThemeStylesProvider';
+
+export default ThemeStylesProvider;
diff --git a/src/styles/addOutlineWidth/index.js b/src/styles/addOutlineWidth/index.js
deleted file mode 100644
index 2a2657b24910..000000000000
--- a/src/styles/addOutlineWidth/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Web and desktop platforms support the "addOutlineWidth" property, so it
- * can be added to the object
- */
-
-import themeDefault from '../themes/default';
-
-/**
- * Adds the addOutlineWidth property to an object to be used when styling
- *
- * @param {Object} obj
- * @param {Number} val
- * @param {boolean} [error=false]
- * @returns {Object}
- */
-function withOutlineWidth(obj, val, error = false) {
-    return {
-        ...obj,
-        outlineWidth: val,
-        outlineStyle: val ? 'auto' : 'none',
-        boxShadow: val !== 0 ? `0px 0px 0px ${val}px ${error ? themeDefault.danger : themeDefault.borderFocus}` : 'none',
-    };
-}
-
-export default withOutlineWidth;
diff --git a/src/styles/addOutlineWidth/index.native.js b/src/styles/addOutlineWidth/index.native.js
deleted file mode 100644
index b678aa95aef0..000000000000
--- a/src/styles/addOutlineWidth/index.native.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Native platforms don't support the "addOutlineWidth" property, so this
- * function is a no-op
- */
-
-/**
- * @param {Object} obj
- * @returns {Object}
- */
-function withOutlineWidth(obj) {
-    return obj;
-}
-
-export default withOutlineWidth;
diff --git a/src/styles/addOutlineWidth/index.native.ts b/src/styles/addOutlineWidth/index.native.ts
new file mode 100644
index 000000000000..69e2ffaf3a5b
--- /dev/null
+++ b/src/styles/addOutlineWidth/index.native.ts
@@ -0,0 +1,10 @@
+/**
+ * Native platforms don't support the "addOutlineWidth" property, so this
+ * function is a no-op
+ */
+
+import AddOutlineWidth from './types';
+
+const addOutlineWidth: AddOutlineWidth = (obj) => obj;
+
+export default addOutlineWidth;
diff --git a/src/styles/addOutlineWidth/index.ts b/src/styles/addOutlineWidth/index.ts
new file mode 100644
index 000000000000..257a3de2b6cd
--- /dev/null
+++ b/src/styles/addOutlineWidth/index.ts
@@ -0,0 +1,19 @@
+/**
+ * Web and desktop platforms support the "addOutlineWidth" property, so it
+ * can be added to the object
+ */
+
+import themeDefault from '../themes/default';
+import AddOutlineWidth from './types';
+
+/**
+ * Adds the addOutlineWidth property to an object to be used when styling
+ */
+const addOutlineWidth: AddOutlineWidth = (obj, val, error = false) => ({
+    ...obj,
+    outlineWidth: val,
+    outlineStyle: val ? 'auto' : 'none',
+    boxShadow: val !== 0 ? `0px 0px 0px ${val}px ${error ? themeDefault.danger : themeDefault.borderFocus}` : 'none',
+});
+
+export default addOutlineWidth;
diff --git a/src/styles/addOutlineWidth/types.ts b/src/styles/addOutlineWidth/types.ts
new file mode 100644
index 000000000000..422d135ef759
--- /dev/null
+++ b/src/styles/addOutlineWidth/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {TextStyle} from 'react-native';
+
+type AddOutlineWidth = (obj: TextStyle | CSSProperties, val?: number, error?: boolean) => TextStyle | CSSProperties;
+
+export default AddOutlineWidth;
diff --git a/src/styles/animation/SpinningIndicatorAnimation.js b/src/styles/animation/SpinningIndicatorAnimation.js
index 8e7fd0277221..29044f0d127a 100644
--- a/src/styles/animation/SpinningIndicatorAnimation.js
+++ b/src/styles/animation/SpinningIndicatorAnimation.js
@@ -42,7 +42,7 @@ class SpinningIndicatorAnimation {
             toValue: 1.666,
             tension: 1,
             isInteraction: false,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }
 
@@ -56,7 +56,7 @@ class SpinningIndicatorAnimation {
             toValue: 1,
             tension: 1,
             isInteraction: false,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start(() => {
             this.rotate.resetAnimation();
             this.scale.resetAnimation();
diff --git a/src/styles/cardStyles/index.js b/src/styles/cardStyles/index.js
deleted file mode 100644
index d8af8a627ffe..000000000000
--- a/src/styles/cardStyles/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Get card style for cardStyleInterpolator
- * @param {Number} screenWidth
- * @returns {Object}
- */
-export default function getCardStyles(screenWidth) {
-    return {
-        position: 'fixed',
-        width: screenWidth,
-        height: '100%',
-    };
-}
diff --git a/src/styles/cardStyles/index.native.js b/src/styles/cardStyles/index.native.js
deleted file mode 100644
index fef33f500708..000000000000
--- a/src/styles/cardStyles/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function getCardStyles() {
-    return {};
-}
diff --git a/src/styles/cardStyles/index.native.ts b/src/styles/cardStyles/index.native.ts
new file mode 100644
index 000000000000..94b8758efd05
--- /dev/null
+++ b/src/styles/cardStyles/index.native.ts
@@ -0,0 +1,5 @@
+import GetCardStyles from './types';
+
+const getCardStyles: GetCardStyles = () => ({});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/index.ts b/src/styles/cardStyles/index.ts
new file mode 100644
index 000000000000..823081b62904
--- /dev/null
+++ b/src/styles/cardStyles/index.ts
@@ -0,0 +1,12 @@
+import GetCardStyles from './types';
+
+/**
+ * Get card style for cardStyleInterpolator
+ */
+const getCardStyles: GetCardStyles = (screenWidth) => ({
+    position: 'fixed',
+    width: screenWidth,
+    height: '100%',
+});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/types.ts b/src/styles/cardStyles/types.ts
new file mode 100644
index 000000000000..e1598b7696ff
--- /dev/null
+++ b/src/styles/cardStyles/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
+
+type GetCardStyles = (screenWidth: number) => Partial<Pick<CSSProperties | ViewStyle, 'position' | 'width' | 'height'>>;
+
+export default GetCardStyles;
diff --git a/src/styles/colors.js b/src/styles/colors.js
index 3ee155be58d2..9ac3226a1b80 100644
--- a/src/styles/colors.js
+++ b/src/styles/colors.js
@@ -2,44 +2,44 @@
  * DO NOT import colors.js into files. Use ../themes/default.js instead.
  */
 export default {
-    dark: '#0b1b34',
     black: '#000000',
-    blue: '#0185ff',
-    blueHover: '#B0D9FF',
+    white: '#FFFFFF',
     ivory: '#fffaf0',
-    orange: '#FF7101',
-    pink: '#F68DFE',
     green: '#03D47C',
     greenHover: '#00C271',
     greenPressed: '#35DD96',
-    greenDisabled: '80E9BD',
     red: '#F25730',
     redHover: '#DE4822',
     redPressed: '#F57959',
-    redDisabled: '#F8AA97',
-    yellow: '#FED607',
     transparent: 'transparent',
 
     // Dark Mode Theme Colors
-    greenAppBackground: '#061B09',
-    greenHighlightBackground: '#07271F',
-    greenBorders: '#1A3D32',
-    greenBordersLighter: '#2B5548',
-    greenIcons: '#8B9C8F',
-    greenSupportingText: '#AFBBB0',
-    white: '#E7ECE9',
-    blueLink: '#5AB0FF',
-    blueLinkHover: '#B0D9FF',
-    blueLinkPreview: '#2EAAE2',
-    greenDefaultButton: '#184E3D',
-    greenDefaultButtonHover: '#2C6755',
-    greenDefaultButtonPressed: '#467164',
-    greenDefaultButtonDisabled: '#8BA69E',
-    midnight: '#002140',
+    darkAppBackground: '#061B09',
+    darkHighlightBackground: '#07271F',
+    darkBorders: '#1A3D32',
+    darkIcons: '#8B9C8F',
+    darkSupportingText: '#AFBBB0',
+    darkPrimaryText: '#E7ECE9',
+    darkDefaultButton: '#184E3D',
+    darkDefaultButtonHover: '#2C6755',
+    darkDefaultButtonPressed: '#467164',
+
+    // Light Mode Theme Colors
+    lightAppBackground: '#FCFBF9',
+    lightHighlightBackground: '#F8F4F0',
+    lightBorders: '#EBE6DF',
+    lightBordersLighter: '#2B5548',
+    lightIcons: '#A2A9A3',
+    lightSupportingText: '#76847E',
+    lightPrimaryText: '#002E22',
+    lightDefaultButton: '#EEEBE7',
+    lightDefaultButtonHover: '#E3DFD9',
+    lightDefaultButtonPressed: '#D2CCC3',
 
     // Brand Colors from Figma
     blue100: '#B0D9FF',
     blue200: '#8DC8FF',
+    blue300: '#5AB0FF',
     blue400: '#0185FF',
     blue500: '#0676DE',
     blue600: '#0164BF',
@@ -48,40 +48,46 @@ export default {
 
     green100: '#B1F2D6',
     green200: '#8EECC4',
+    green300: '#5BE3AA',
     green400: '#03D47C',
+    green500: '#00B268',
     green600: '#008C59',
     green700: '#085239',
     green800: '#002E22',
 
+    yellow100: '#FFF2B2',
     yellow200: '#FFED8F',
+    yellow300: '#FEE45E',
     yellow400: '#FED607',
+    yellow500: '#E4BC07',
+    yellow600: '#D18000',
     yellow700: '#722B03',
     yellow800: '#401102',
 
+    tangerine100: '#FFD7B0',
     tangerine200: '#FFC68C',
+    tangerine300: '#FFA75A',
     tangerine400: '#FF7101',
+    tangerine500: '#F25730',
+    tangerine600: '#BF3013',
     tangerine700: '#780505',
     tangerine800: '#400000',
 
+    pink100: '#FCDCFF',
     pink200: '#FBCCFF',
+    pink300: '#F9B5FE',
     pink400: '#F68DFE',
+    pink500: '#E96DF2',
     pink600: '#CF4CD9',
     pink700: '#712A76',
     pink800: '#49225B',
 
+    ice100: '#DFFDFE',
     ice200: '#CCF7FF',
+    ice300: '#A5FBFF',
     ice400: '#50EEF6',
+    ice500: '#4ED7DE',
+    ice600: '#4BA6A6',
     ice700: '#28736D',
     ice800: '#134038',
-
-    orange800: '#400000',
-
-    // DEPRECATED COLORS. Do not reference these colors. Will be deleted in color switch PR.
-    gray1: '#FAFAFA',
-    gray2: '#ECECEC',
-    gray3: '#C6C9CA',
-    gray4: '#7D8B8F',
-    oldRed: '#fc3826',
-    oldRedHover: '#e13826',
-    oldRedDisabled: '#fea29a',
 };
diff --git a/src/styles/containerComposeStyles/index.native.js b/src/styles/containerComposeStyles/index.native.js
deleted file mode 100644
index 002331581108..000000000000
--- a/src/styles/containerComposeStyles/index.native.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import styles from '../styles';
-
-const containerComposeStyles = [styles.textInputComposeSpacing];
-
-export default containerComposeStyles;
diff --git a/src/styles/containerComposeStyles/index.native.ts b/src/styles/containerComposeStyles/index.native.ts
new file mode 100644
index 000000000000..6b6bcf71cfcf
--- /dev/null
+++ b/src/styles/containerComposeStyles/index.native.ts
@@ -0,0 +1,6 @@
+import {StyleProp, ViewStyle} from 'react-native';
+import styles from '../styles';
+
+const containerComposeStyles: StyleProp<ViewStyle> = [styles.textInputComposeSpacing];
+
+export default containerComposeStyles;
diff --git a/src/styles/containerComposeStyles/index.js b/src/styles/containerComposeStyles/index.ts
similarity index 55%
rename from src/styles/containerComposeStyles/index.js
rename to src/styles/containerComposeStyles/index.ts
index 23a4d7ed7720..6968e23a507e 100644
--- a/src/styles/containerComposeStyles/index.js
+++ b/src/styles/containerComposeStyles/index.ts
@@ -1,6 +1,7 @@
+import {StyleProp, ViewStyle} from 'react-native';
 import styles from '../styles';
 
 // We need to set paddingVertical = 0 on web to avoid displaying a normal pointer on some parts of compose box when not in focus
-const containerComposeStyles = [styles.textInputComposeSpacing, {paddingVertical: 0}];
+const containerComposeStyles: StyleProp<ViewStyle> = [styles.textInputComposeSpacing, {paddingVertical: 0}];
 
 export default containerComposeStyles;
diff --git a/src/styles/fontWeight/bold/index.android.js b/src/styles/fontWeight/bold/index.android.ts
similarity index 51%
rename from src/styles/fontWeight/bold/index.android.js
rename to src/styles/fontWeight/bold/index.android.ts
index 46e404677d8d..3119e0f391cd 100644
--- a/src/styles/fontWeight/bold/index.android.js
+++ b/src/styles/fontWeight/bold/index.android.ts
@@ -1,3 +1,7 @@
+import FontWeightBoldStyles from './types';
+
 // Android has ExpensifyNeue-Bold, but fontWeight: '700' will result in
 // an incorrect font displaying on Android
-export default '600';
+const bold: FontWeightBoldStyles = '600';
+
+export default bold;
diff --git a/src/styles/fontWeight/bold/index.js b/src/styles/fontWeight/bold/index.js
deleted file mode 100644
index 2444ed19bf9f..000000000000
--- a/src/styles/fontWeight/bold/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Web only has ExpensifyNeue-Regular so to achieve bold we need to add this fontWeight
-export default '700';
diff --git a/src/styles/fontWeight/bold/index.ts b/src/styles/fontWeight/bold/index.ts
new file mode 100644
index 000000000000..45de49abb35b
--- /dev/null
+++ b/src/styles/fontWeight/bold/index.ts
@@ -0,0 +1,6 @@
+import FontWeightBoldStyles from './types';
+
+// Web only has ExpensifyNeue-Regular so to achieve bold we need to add this fontWeight
+const bold: FontWeightBoldStyles = '700';
+
+export default bold;
diff --git a/src/styles/fontWeight/bold/types.ts b/src/styles/fontWeight/bold/types.ts
new file mode 100644
index 000000000000..3c9930a63d87
--- /dev/null
+++ b/src/styles/fontWeight/bold/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {TextStyle} from 'react-native';
+
+type FontWeightBoldStyles = (TextStyle | CSSProperties)['fontWeight'];
+
+export default FontWeightBoldStyles;
diff --git a/src/styles/getPopoverWithMeasuredContentStyles.js b/src/styles/getPopoverWithMeasuredContentStyles.ts
similarity index 74%
rename from src/styles/getPopoverWithMeasuredContentStyles.js
rename to src/styles/getPopoverWithMeasuredContentStyles.ts
index 2ab54d702823..4d4e868f823b 100644
--- a/src/styles/getPopoverWithMeasuredContentStyles.js
+++ b/src/styles/getPopoverWithMeasuredContentStyles.ts
@@ -5,12 +5,11 @@ import variables from './variables';
  * Compute the amount that the Context menu's Anchor needs to be horizontally shifted
  * in order to keep it from displaying in the gutters.
  *
- * @param {Number} anchorLeftEdge - Menu's anchor Left edge.
- * @param {Number} menuWidth - The width of the menu itself.
- * @param {Number} windowWidth - The width of the Window.
- * @returns {Number}
+ * @param anchorLeftEdge - Menu's anchor Left edge.
+ * @param menuWidth - The width of the menu itself.
+ * @param windowWidth - The width of the Window.
  */
-function computeHorizontalShift(anchorLeftEdge, menuWidth, windowWidth) {
+function computeHorizontalShift(anchorLeftEdge: number, menuWidth: number, windowWidth: number): number {
     const popoverRightEdge = anchorLeftEdge + menuWidth;
     if (anchorLeftEdge < variables.gutterWidth) {
         // Anchor is in left gutter, shift right by a multiple of four.
@@ -30,12 +29,11 @@ function computeHorizontalShift(anchorLeftEdge, menuWidth, windowWidth) {
  * Compute the amount that the Context menu's Anchor needs to be vertically shifted
  * in order to keep it from displaying in the window.
  *
- * @param {Number} anchorTopEdge - Menu's anchor Top edge.
- * @param {Number} menuHeight - The height of the menu itself.
- * @param {Number} windowHeight - The height of the Window.
- * @returns {Number}
+ * @param anchorTopEdge - Menu's anchor Top edge.
+ * @param menuHeight - The height of the menu itself.
+ * @param windowHeight - The height of the Window.
  */
-function computeVerticalShift(anchorTopEdge, menuHeight, windowHeight) {
+function computeVerticalShift(anchorTopEdge: number, menuHeight: number, windowHeight: number): number {
     const popoverBottomEdge = anchorTopEdge + menuHeight;
 
     if (anchorTopEdge < 0) {
diff --git a/src/styles/getReportActionContextMenuStyles.js b/src/styles/getReportActionContextMenuStyles.ts
similarity index 56%
rename from src/styles/getReportActionContextMenuStyles.js
rename to src/styles/getReportActionContextMenuStyles.ts
index 026306084ce4..9c0e159eb5fe 100644
--- a/src/styles/getReportActionContextMenuStyles.js
+++ b/src/styles/getReportActionContextMenuStyles.ts
@@ -1,12 +1,16 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
 import styles from './styles';
 import variables from './variables';
 import themeColors from './themes/default';
 
-const defaultWrapperStyle = {
+type StylesArray = Array<ViewStyle | CSSProperties>;
+
+const defaultWrapperStyle: ViewStyle | CSSProperties = {
     backgroundColor: themeColors.componentBG,
 };
 
-const miniWrapperStyle = [
+const miniWrapperStyle: StylesArray = [
     styles.flexRow,
     defaultWrapperStyle,
     {
@@ -18,20 +22,21 @@ const miniWrapperStyle = [
     },
 ];
 
-const bigWrapperStyle = [styles.flexColumn, defaultWrapperStyle];
+const bigWrapperStyle: StylesArray = [styles.flexColumn, defaultWrapperStyle];
 
 /**
  * Generate the wrapper styles for the ReportActionContextMenu.
  *
- * @param {Boolean} isMini
- * @param {Boolean} isSmallScreenWidth
- * @returns {Array}
+ * @param isMini
+ * @param isSmallScreenWidth
  */
-function getReportActionContextMenuStyles(isMini, isSmallScreenWidth) {
+function getReportActionContextMenuStyles(isMini: boolean, isSmallScreenWidth: boolean): StylesArray {
     if (isMini) {
         return miniWrapperStyle;
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return [
         ...bigWrapperStyle,
 
diff --git a/src/styles/getTooltipStyles.js b/src/styles/getTooltipStyles.ts
similarity index 77%
rename from src/styles/getTooltipStyles.js
rename to src/styles/getTooltipStyles.ts
index bc5fcfe807aa..97402467ab4c 100644
--- a/src/styles/getTooltipStyles.js
+++ b/src/styles/getTooltipStyles.ts
@@ -1,35 +1,35 @@
+import {CSSProperties} from 'react';
+import {TextStyle, View, ViewStyle} from 'react-native';
 import spacing from './utilities/spacing';
 import styles from './styles';
-import colors from './colors';
 import themeColors from './themes/default';
 import fontFamily from './fontFamily';
 import variables from './variables';
 import roundToNearestMultipleOfFour from './roundToNearestMultipleOfFour';
 
-// This defines the proximity with the edge of the window in which tooltips should not be displayed.
-// If a tooltip is too close to the edge of the screen, we'll shift it towards the center.
+/** This defines the proximity with the edge of the window in which tooltips should not be displayed.
+ * If a tooltip is too close to the edge of the screen, we'll shift it towards the center. */
 const GUTTER_WIDTH = variables.gutterWidth;
 
-// The height of a tooltip pointer
+/** The height of a tooltip pointer */
 const POINTER_HEIGHT = 4;
 
-// The width of a tooltip pointer
+/** The width of a tooltip pointer */
 const POINTER_WIDTH = 12;
 
 /**
  * Compute the amount the tooltip needs to be horizontally shifted in order to keep it from displaying in the gutters.
  *
- * @param {Number} windowWidth - The width of the window.
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param windowWidth - The width of the window.
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} componentWidth - The width of the wrapped component.
- * @param {Number} tooltipWidth - The width of the tooltip itself.
- * @param {Number} [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
+ * @param componentWidth - The width of the wrapped component.
+ * @param tooltipWidth - The width of the tooltip itself.
+ * @param [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
  *                                         A positive value shifts it to the right,
  *                                         and a negative value shifts it to the left.
- * @returns {Number}
  */
-function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWidth, manualShiftHorizontal) {
+function computeHorizontalShift(windowWidth: number, xOffset: number, componentWidth: number, tooltipWidth: number, manualShiftHorizontal: number): number {
     // First find the left and right edges of the tooltip (by default, it is centered on the component).
     const componentCenter = xOffset + componentWidth / 2 + manualShiftHorizontal;
     const tooltipLeftEdge = componentCenter - tooltipWidth / 2;
@@ -61,16 +61,15 @@ function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWid
  *                       |         |
  *                       |_ _ _ _ _|
  *
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param tooltip - The reference to the tooltip's root element
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} yOffset - The distance between the top edge of the window
+ * @param yOffset - The distance between the top edge of the window
  *                           and the top edge of the wrapped component.
- * @param {Element} [tooltip] - The reference to the tooltip's root element
- * @param {Number} tooltipTargetWidth - The width of the tooltip's target
- * @param {Number} tooltipTargetHeight - The height of the tooltip's target
- * @returns {Boolean}
+ * @param tooltipTargetWidth - The width of the tooltip's target
+ * @param tooltipTargetHeight - The height of the tooltip's target
  */
-function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, tooltipTargetHeight) {
+function isOverlappingAtTop(tooltip: View | HTMLDivElement, xOffset: number, yOffset: number, tooltipTargetWidth: number, tooltipTargetHeight: number) {
     if (typeof document.elementFromPoint !== 'function') {
         return false;
     }
@@ -79,10 +78,9 @@ function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, toolt
     // in case the target has a border radius or is a multiline text.
     const targetCenterX = xOffset + tooltipTargetWidth / 2;
     const elementAtTargetCenterX = document.elementFromPoint(targetCenterX, yOffset);
-    const tooltipRef = (tooltip && tooltip.current) || tooltip;
 
     // Ensure it's not the already rendered element of this very tooltip, so the tooltip doesn't try to "avoid" itself
-    if (!elementAtTargetCenterX || (tooltipRef && tooltipRef.contains(elementAtTargetCenterX))) {
+    if (!elementAtTargetCenterX || ('contains' in tooltip && tooltip.contains(elementAtTargetCenterX))) {
         return false;
     }
 
@@ -95,42 +93,49 @@ function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, toolt
     return isOverlappingAtTargetCenterX;
 }
 
+type TooltipStyles = {
+    animationStyle: ViewStyle;
+    rootWrapperStyle: ViewStyle | CSSProperties;
+    textStyle: TextStyle;
+    pointerWrapperStyle: ViewStyle | CSSProperties;
+    pointerStyle: ViewStyle;
+};
+
 /**
  * Generate styles for the tooltip component.
  *
- * @param {Number} currentSize - The current size of the tooltip used in the scaling animation.
- * @param {Number} windowWidth - The width of the window.
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param tooltip - The reference to the tooltip's root element
+ * @param currentSize - The current size of the tooltip used in the scaling animation.
+ * @param windowWidth - The width of the window.
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} yOffset - The distance between the top edge of the window
+ * @param yOffset - The distance between the top edge of the window
  *                           and the top edge of the wrapped component.
- * @param {Number} tooltipTargetWidth - The width of the tooltip's target
- * @param {Number} tooltipTargetHeight - The height of the tooltip's target
- * @param {Number} maxWidth - The tooltip's max width.
- * @param {Number} tooltipContentWidth - The tooltip's inner content measured width.
- * @param {Number} tooltipWrapperHeight - The tooltip's wrapper measured height.
- * @param {Number} [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
+ * @param tooltipTargetWidth - The width of the tooltip's target
+ * @param tooltipTargetHeight - The height of the tooltip's target
+ * @param maxWidth - The tooltip's max width.
+ * @param tooltipContentWidth - The tooltip's inner content measured width.
+ * @param tooltipWrapperHeight - The tooltip's wrapper measured height.
+ * @param [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
  *                                         A positive value shifts it to the right,
  *                                         and a negative value shifts it to the left.
- * @param {Number} [manualShiftVertical] - Any additional amount to manually shift the tooltip up or down.
+ * @param [manualShiftVertical] - Any additional amount to manually shift the tooltip up or down.
  *                                       A positive value shifts it down, and a negative value shifts it up.
- * @param {Element} tooltip - The reference to the tooltip's root element
- * @returns {Object}
  */
 export default function getTooltipStyles(
-    currentSize,
-    windowWidth,
-    xOffset,
-    yOffset,
-    tooltipTargetWidth,
-    tooltipTargetHeight,
-    maxWidth,
-    tooltipContentWidth,
-    tooltipWrapperHeight,
+    tooltip: View | HTMLDivElement,
+    currentSize: number,
+    windowWidth: number,
+    xOffset: number,
+    yOffset: number,
+    tooltipTargetWidth: number,
+    tooltipTargetHeight: number,
+    maxWidth: number,
+    tooltipContentWidth: number,
+    tooltipWrapperHeight: number,
     manualShiftHorizontal = 0,
     manualShiftVertical = 0,
-    tooltip,
-) {
+): TooltipStyles {
     const tooltipVerticalPadding = spacing.pv1;
 
     // We calculate tooltip width based on the tooltip's content width
@@ -141,7 +146,7 @@ export default function getTooltipStyles(
 
     const isTooltipSizeReady = tooltipWidth !== undefined && tooltipHeight !== undefined;
 
-    // Set the scale to 1 to be able to measure the toolip size correctly when it's not ready yet.
+    // Set the scale to 1 to be able to measure the tooltip size correctly when it's not ready yet.
     let scale = 1;
     let shouldShowBelow = false;
     let horizontalShift = 0;
@@ -157,7 +162,7 @@ export default function getTooltipStyles(
         // If either a tooltip will try to render within GUTTER_WIDTH logical pixels of the top of the screen,
         // Or the wrapped component is overlapping at top-center with another element
         // we'll display it beneath its wrapped component rather than above it as usual.
-        shouldShowBelow = yOffset - tooltipHeight < GUTTER_WIDTH || isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, tooltipTargetHeight);
+        shouldShowBelow = yOffset - tooltipHeight < GUTTER_WIDTH || isOverlappingAtTop(tooltip, xOffset, yOffset, tooltipTargetWidth, tooltipTargetHeight);
 
         // When the tooltip size is ready, we can start animating the scale.
         scale = currentSize;
@@ -261,13 +266,13 @@ export default function getTooltipStyles(
         pointerStyle: {
             width: 0,
             height: 0,
-            backgroundColor: colors.transparent,
+            backgroundColor: themeColors.transparent,
             borderStyle: 'solid',
             borderLeftWidth: POINTER_WIDTH / 2,
             borderRightWidth: POINTER_WIDTH / 2,
             borderTopWidth: POINTER_HEIGHT,
-            borderLeftColor: colors.transparent,
-            borderRightColor: colors.transparent,
+            borderLeftColor: themeColors.transparent,
+            borderRightColor: themeColors.transparent,
             borderTopColor: themeColors.heading,
             ...pointerAdditionalStyle,
         },
diff --git a/src/styles/pointerEventsNone/index.js b/src/styles/pointerEventsNone/index.js
deleted file mode 100644
index 93002d269d01..000000000000
--- a/src/styles/pointerEventsNone/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-    pointerEvents: 'none',
-};
diff --git a/src/styles/pointerEventsNone/index.native.ts b/src/styles/pointerEventsNone/index.native.ts
new file mode 100644
index 000000000000..d92936025c94
--- /dev/null
+++ b/src/styles/pointerEventsNone/index.native.ts
@@ -0,0 +1,5 @@
+import PointerEventsNone from './types';
+
+const pointerEventsNone: PointerEventsNone = {};
+
+export default pointerEventsNone;
diff --git a/src/styles/pointerEventsNone/index.ts b/src/styles/pointerEventsNone/index.ts
new file mode 100644
index 000000000000..20dc46412e6d
--- /dev/null
+++ b/src/styles/pointerEventsNone/index.ts
@@ -0,0 +1,7 @@
+import PointerEventsNone from './types';
+
+const pointerEventsNone: PointerEventsNone = {
+    pointerEvents: 'none',
+};
+
+export default pointerEventsNone;
diff --git a/src/styles/pointerEventsNone/types.ts b/src/styles/pointerEventsNone/types.ts
new file mode 100644
index 000000000000..f2f5a0d88a41
--- /dev/null
+++ b/src/styles/pointerEventsNone/types.ts
@@ -0,0 +1,5 @@
+import {CSSProperties} from 'react';
+
+type PointerEventsNone = Partial<Pick<CSSProperties, 'pointerEvents'>>;
+
+export default PointerEventsNone;
diff --git a/src/styles/styles.js b/src/styles/styles.js
index d4fc1073bc46..a748a0fb353b 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1,9 +1,8 @@
 import {defaultStyles as defaultPickerStyles} from 'react-native-picker-select/src/styles';
-import {StyleSheet} from 'react-native';
 import lodashClamp from 'lodash/clamp';
 import fontFamily from './fontFamily';
 import addOutlineWidth from './addOutlineWidth';
-import themeColors from './themes/default';
+import defaultTheme from './themes/default';
 import fontWeightBold from './fontWeight/bold';
 import variables from './variables';
 import spacing from './utilities/spacing';
@@ -27,14 +26,15 @@ import * as Browser from '../libs/Browser';
 import cursor from './utilities/cursor';
 import userSelect from './utilities/userSelect';
 import textUnderline from './utilities/textUnderline';
-import Colors from './colors';
 
 // touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
 const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};
+// to prevent vertical text offset in Safari for badges, new lineHeight values have been added
+const lineHeightBadge = Browser.isSafari() ? {lineHeight: variables.lineHeightXSmall} : {lineHeight: variables.lineHeightNormal};
 
-const picker = {
-    backgroundColor: themeColors.transparent,
-    color: themeColors.text,
+const picker = (theme) => ({
+    backgroundColor: theme.transparent,
+    color: theme.text,
     fontFamily: fontFamily.EXP_NEUE,
     fontSize: variables.fontSizeNormal,
     lineHeight: variables.fontSizeNormalHeight,
@@ -45,27 +45,27 @@ const picker = {
     height: variables.inputHeight,
     borderWidth: 0,
     textAlign: 'left',
-};
+});
 
-const link = {
-    color: themeColors.link,
-    textDecorationColor: themeColors.link,
+const link = (theme) => ({
+    color: theme.link,
+    textDecorationColor: theme.link,
     fontFamily: fontFamily.EXP_NEUE,
-};
+});
 
-const baseCodeTagStyles = {
+const baseCodeTagStyles = (theme) => ({
     borderWidth: 1,
     borderRadius: 5,
-    borderColor: themeColors.border,
-    backgroundColor: themeColors.textBackground,
-};
+    borderColor: theme.border,
+    backgroundColor: theme.textBackground,
+});
 
 const headlineFont = {
     fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
     fontWeight: '500',
 };
 
-const webViewStyles = {
+const webViewStyles = (theme) => ({
     // As of react-native-render-html v6, don't declare distinct styles for
     // custom renderers, the API for custom renderers has changed. Declare the
     // styles in the below "tagStyles" instead. If you need to reuse those
@@ -80,6 +80,7 @@ const webViewStyles = {
         del: {
             textDecorationLine: 'line-through',
             textDecorationStyle: 'solid',
+            flex: 1,
         },
 
         strong: {
@@ -87,7 +88,7 @@ const webViewStyles = {
             fontWeight: 'bold',
         },
 
-        a: link,
+        a: link(theme),
 
         ul: {
             maxWidth: '100%',
@@ -102,7 +103,7 @@ const webViewStyles = {
         },
 
         blockquote: {
-            borderLeftColor: themeColors.border,
+            borderLeftColor: theme.border,
             borderLeftWidth: 4,
             paddingLeft: 12,
             marginTop: 4,
@@ -113,7 +114,7 @@ const webViewStyles = {
         },
 
         pre: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             paddingTop: 12,
             paddingBottom: 12,
             paddingRight: 8,
@@ -124,7 +125,7 @@ const webViewStyles = {
         },
 
         code: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             ...codeStyles.codeTextStyle,
             paddingLeft: 5,
             paddingRight: 5,
@@ -133,7 +134,7 @@ const webViewStyles = {
         },
 
         img: {
-            borderColor: themeColors.border,
+            borderColor: theme.border,
             borderRadius: variables.componentBorderRadiusNormal,
             borderWidth: 1,
             ...touchCalloutNone,
@@ -150,15 +151,16 @@ const webViewStyles = {
     },
 
     baseFontStyle: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         flex: 1,
         lineHeight: variables.fontSizeNormalHeight,
+        ...writingDirection.ltr,
     },
-};
+});
 
-const styles = {
+const styles = (theme) => ({
     // Add all of our utility and helper styles
     ...spacing,
     ...sizing,
@@ -171,8 +173,8 @@ const styles = {
     ...writingDirection,
     ...cursor,
     ...userSelect,
-    ...themeColors,
     ...textUnderline,
+    ...theme, // TODO: Should we do this?
 
     rateCol: {
         margin: 0,
@@ -181,10 +183,10 @@ const styles = {
     },
 
     autoCompleteSuggestionsContainer: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         borderRadius: 8,
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         justifyContent: 'center',
         boxShadow: variables.popoverMenuShadow,
         position: 'absolute',
@@ -228,7 +230,7 @@ const styles = {
     },
 
     mentionSuggestionsHandle: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     appIconBorderRadius: {
@@ -243,30 +245,30 @@ const styles = {
         flexBasis: '48%',
     },
 
-    webViewStyles,
+    webViewStyles: webViewStyles(theme),
 
-    link,
+    link: link(theme),
 
     linkMuted: {
-        color: themeColors.textSupporting,
-        textDecorationColor: themeColors.textSupporting,
+        color: theme.textSupporting,
+        textDecorationColor: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
     },
 
     linkMutedHovered: {
-        color: themeColors.textMutedReversed,
+        color: theme.textMutedReversed,
     },
 
     highlightBG: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
     },
 
     appBG: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     h1: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeh1,
         fontWeight: fontWeightBold,
@@ -306,13 +308,13 @@ const styles = {
     },
 
     textLabel: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
     },
 
     mutedTextLabel: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
     },
@@ -324,7 +326,7 @@ const styles = {
     },
 
     textMicroBold: {
-        color: themeColors.text,
+        color: theme.text,
         fontWeight: fontWeightBold,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeSmall,
@@ -332,14 +334,14 @@ const styles = {
     },
 
     textMicroSupporting: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightSmall,
     },
 
     textExtraSmallSupporting: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeExtraSmall,
     },
@@ -383,7 +385,7 @@ const styles = {
     textHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
     },
@@ -391,7 +393,7 @@ const styles = {
     textHeadlineH1: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeh1,
         lineHeight: variables.lineHeightSizeh1,
     },
@@ -401,11 +403,11 @@ const styles = {
     },
 
     textWhite: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     textBlue: {
-        color: themeColors.link,
+        color: theme.link,
     },
 
     textUppercase: {
@@ -417,19 +419,19 @@ const styles = {
     },
 
     colorReversed: {
-        color: themeColors.textReversed,
+        color: theme.textReversed,
     },
 
     colorMutedReversed: {
-        color: themeColors.textMutedReversed,
+        color: theme.textMutedReversed,
     },
 
     colorMuted: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     colorHeading: {
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     bgTransparent: {
@@ -437,7 +439,7 @@ const styles = {
     },
 
     bgDark: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
     },
 
     opacity0: {
@@ -449,7 +451,7 @@ const styles = {
     },
 
     textDanger: {
-        color: themeColors.danger,
+        color: theme.danger,
     },
 
     borderRadiusNormal: {
@@ -457,7 +459,7 @@ const styles = {
     },
 
     button: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
         borderRadius: variables.buttonBorderRadius,
         minHeight: variables.componentSizeLarge,
         justifyContent: 'center',
@@ -470,7 +472,7 @@ const styles = {
     },
 
     buttonText: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -491,7 +493,7 @@ const styles = {
         paddingTop: 4,
         paddingHorizontal: 14,
         paddingBottom: 4,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonMedium: {
@@ -501,7 +503,7 @@ const styles = {
         paddingRight: 16,
         paddingBottom: 12,
         paddingLeft: 16,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonLarge: {
@@ -511,7 +513,7 @@ const styles = {
         paddingRight: 10,
         paddingBottom: 8,
         paddingLeft: 18,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonSmallText: {
@@ -536,12 +538,12 @@ const styles = {
     },
 
     buttonDefaultHovered: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
         borderWidth: 0,
     },
 
     buttonSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         borderWidth: 0,
     },
 
@@ -550,29 +552,29 @@ const styles = {
     },
 
     buttonSuccessHovered: {
-        backgroundColor: themeColors.successHover,
+        backgroundColor: theme.successHover,
         borderWidth: 0,
     },
 
     buttonDanger: {
-        backgroundColor: themeColors.danger,
+        backgroundColor: theme.danger,
         borderWidth: 0,
     },
 
     buttonDangerHovered: {
-        backgroundColor: themeColors.dangerHover,
+        backgroundColor: theme.dangerHover,
         borderWidth: 0,
     },
 
     buttonDisabled: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
         borderWidth: 0,
     },
 
     buttonDivider: {
         height: variables.dropDownButtonDividerHeight,
         borderWidth: 0.7,
-        borderColor: themeColors.text,
+        borderColor: theme.text,
     },
 
     noBorderRadius: {
@@ -617,19 +619,19 @@ const styles = {
     },
 
     buttonSuccessText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     buttonDangerText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     hoveredComponentBG: {
-        backgroundColor: themeColors.hoverComponentBG,
+        backgroundColor: theme.hoverComponentBG,
     },
 
     activeComponentBG: {
-        backgroundColor: themeColors.activeComponentBG,
+        backgroundColor: theme.activeComponentBG,
     },
 
     fontWeightBold: {
@@ -659,7 +661,7 @@ const styles = {
         height: 140,
     },
 
-    pickerSmall: (backgroundColor = themeColors.highlightBG) => ({
+    pickerSmall: (backgroundColor = theme.highlightBG) => ({
         inputIOS: {
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
@@ -668,23 +670,23 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             height: 26,
             opacity: 1,
             backgroundColor: 'transparent',
         },
         done: {
-            color: themeColors.text,
+            color: theme.text,
         },
         doneDepressed: {
             fontSize: defaultPickerStyles.done.fontSize,
         },
         modalViewMiddle: {
-            backgroundColor: themeColors.border,
+            backgroundColor: theme.border,
             borderTopWidth: 0,
         },
         modalViewBottom: {
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
         },
         inputWeb: {
             fontFamily: fontFamily.EXP_NEUE,
@@ -694,7 +696,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             appearance: 'none',
             height: 26,
             opacity: 1,
@@ -709,7 +711,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             height: 26,
             opacity: 1,
             backgroundColor: 'transparent',
@@ -725,7 +727,7 @@ const styles = {
     }),
 
     badge: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         borderRadius: 14,
         height: variables.iconSizeNormal,
         flexDirection: 'row',
@@ -734,54 +736,70 @@ const styles = {
     },
 
     badgeSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     badgeSuccessPressed: {
-        backgroundColor: themeColors.successHover,
+        backgroundColor: theme.successHover,
     },
 
     badgeAdHocSuccess: {
-        backgroundColor: themeColors.badgeAdHoc,
+        backgroundColor: theme.badgeAdHoc,
     },
 
     badgeAdHocSuccessPressed: {
-        backgroundColor: themeColors.badgeAdHocHover,
+        backgroundColor: theme.badgeAdHocHover,
     },
 
     badgeDanger: {
-        backgroundColor: themeColors.danger,
+        backgroundColor: theme.danger,
     },
 
     badgeDangerPressed: {
-        backgroundColor: themeColors.dangerPressed,
+        backgroundColor: theme.dangerPressed,
     },
 
     badgeText: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeSmall,
-        lineHeight: variables.lineHeightNormal,
+        ...lineHeightBadge,
         ...whiteSpace.noWrap,
     },
 
     border: {
         borderWidth: 1,
         borderRadius: variables.componentBorderRadius,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderColorFocus: {
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
     },
 
     borderColorDanger: {
-        borderColor: themeColors.danger,
+        borderColor: theme.danger,
+    },
+
+    textInputDisabled: {
+        // Adding disabled color theme to indicate user that the field is not editable.
+        backgroundColor: theme.highlightBG,
+        borderBottomWidth: 2,
+        borderColor: theme.borderLighter,
+        // Adding browser specefic style to bring consistency between Safari and other platforms.
+        // Applying the Webkit styles only to browsers as it is not available in native.
+        ...(Browser.getBrowser()
+            ? {
+                  WebkitTextFillColor: theme.textSupporting,
+                  WebkitOpacity: 1,
+              }
+            : {}),
+        color: theme.textSupporting,
     },
 
     uploadReceiptView: (isSmallScreenWidth) => ({
         borderRadius: variables.componentBorderRadiusLarge,
         borderWidth: isSmallScreenWidth ? 0 : 2,
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
         borderStyle: 'dotted',
         marginBottom: 20,
         marginLeft: 20,
@@ -800,8 +818,8 @@ const styles = {
         borderRadius: 28,
         borderStyle: 'solid',
         borderWidth: 8,
-        backgroundColor: Colors.greenHighlightBackground,
-        borderColor: Colors.greenAppBackground,
+        backgroundColor: theme.highlightBG,
+        borderColor: theme.appBG,
     },
 
     permissionView: {
@@ -812,14 +830,14 @@ const styles = {
     },
 
     headerAnonymousFooter: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
     },
 
     headerText: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -844,7 +862,7 @@ const styles = {
     },
 
     chatItemComposeSecondaryRowSubText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightSmall,
@@ -905,7 +923,7 @@ const styles = {
     },
 
     calendarDayContainerSelected: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     /**
@@ -931,7 +949,7 @@ const styles = {
         height: '100%',
         backgroundColor: 'transparent',
         borderBottomWidth: 2,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         overflow: 'hidden',
     },
 
@@ -940,7 +958,7 @@ const styles = {
         left: 0,
         top: 0,
         fontSize: variables.fontSizeNormal,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         width: '100%',
     },
@@ -950,7 +968,7 @@ const styles = {
         top: 0,
         width: '100%',
         height: 23,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
     },
 
     textInputLabelDesktop: {
@@ -965,7 +983,7 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         lineHeight: variables.lineHeightXLarge,
-        color: themeColors.text,
+        color: theme.text,
         paddingTop: 23,
         paddingBottom: 8,
         paddingLeft: 0,
@@ -1004,9 +1022,9 @@ const styles = {
         backgroundColor: 'transparent',
         borderRadius: variables.componentBorderRadiusNormal,
         height: variables.inputComponentSizeNormal,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         paddingLeft: 12,
@@ -1029,7 +1047,7 @@ const styles = {
     },
 
     textInputPrefix: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         textAlignVertical: 'center',
@@ -1039,7 +1057,7 @@ const styles = {
         borderBottomWidth: 2,
         paddingLeft: 0,
         borderStyle: 'solid',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         justifyContent: 'center',
         backgroundColor: 'transparent',
         height: variables.inputHeight,
@@ -1057,7 +1075,7 @@ const styles = {
         zIndex: 1,
     },
 
-    picker: (disabled = false, backgroundColor = themeColors.appBG) => ({
+    picker: (disabled = false, backgroundColor = theme.appBG) => ({
         iconContainer: {
             top: Math.round(variables.inputHeight * 0.5) - 11,
             right: 0,
@@ -1067,57 +1085,63 @@ const styles = {
         inputWeb: {
             appearance: 'none',
             ...(disabled ? cursor.cursorDisabled : cursor.cursorPointer),
-            ...picker,
+            ...picker(theme),
             backgroundColor,
         },
 
         inputIOS: {
-            ...picker,
+            ...picker(theme),
         },
         done: {
-            color: themeColors.text,
+            color: theme.text,
         },
         doneDepressed: {
             fontSize: defaultPickerStyles.done.fontSize,
         },
         modalViewMiddle: {
-            backgroundColor: themeColors.border,
+            backgroundColor: theme.border,
             borderTopWidth: 0,
         },
         modalViewBottom: {
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
         },
 
         inputAndroid: {
-            ...picker,
+            ...picker(theme),
         },
     }),
 
     disabledText: {
-        color: themeColors.icon,
+        color: theme.icon,
     },
 
     inputDisabled: {
-        backgroundColor: themeColors.highlightBG,
-        color: themeColors.icon,
+        backgroundColor: theme.highlightBG,
+        color: theme.icon,
     },
 
     noOutline: addOutlineWidth({}, 0),
 
     errorOutline: {
-        borderColor: themeColors.danger,
+        borderColor: theme.danger,
     },
 
     textLabelSupporting: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
+    },
+
+    textLabelError: {
+        fontFamily: fontFamily.EXP_NEUE,
+        fontSize: variables.fontSizeLabel,
+        color: theme.textError,
     },
 
     textReceiptUpload: {
         ...headlineFont,
         fontSize: variables.fontSizeXLarge,
-        color: themeColors.textLight,
+        color: theme.textLight,
         textAlign: 'center',
     },
 
@@ -1125,13 +1149,13 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         lineHeight: variables.lineHeightLarge,
         textAlign: 'center',
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     furtherDetailsText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     lh16: {
@@ -1147,35 +1171,35 @@ const styles = {
     },
 
     formHelp: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
         marginBottom: 4,
     },
 
     formError: {
-        color: themeColors.textError,
+        color: theme.textError,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.formErrorLineHeight,
         marginBottom: 4,
     },
 
     formSuccess: {
-        color: themeColors.success,
+        color: theme.success,
         fontSize: variables.fontSizeLabel,
         lineHeight: 18,
         marginBottom: 4,
     },
 
     desktopRedirectPage: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         minHeight: '100%',
         flex: 1,
         alignItems: 'center',
     },
 
     signInPage: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         minHeight: '100%',
         flex: 1,
     },
@@ -1255,7 +1279,7 @@ const styles = {
 
     // Sidebar Styles
     sidebar: {
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         height: '100%',
     },
 
@@ -1273,14 +1297,14 @@ const styles = {
     },
 
     sidebarAvatar: {
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 20,
         height: variables.componentSizeNormal,
         width: variables.componentSizeNormal,
     },
 
-    statusIndicator: (backgroundColor = themeColors.danger) => ({
-        borderColor: themeColors.sidebar,
+    statusIndicator: (backgroundColor = theme.danger) => ({
+        borderColor: theme.sidebar,
         backgroundColor,
         borderRadius: 8,
         borderWidth: 2,
@@ -1302,7 +1326,7 @@ const styles = {
     },
 
     floatingActionButton: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         height: variables.componentSizeLarge,
         width: variables.componentSizeLarge,
         borderRadius: 999,
@@ -1311,7 +1335,7 @@ const styles = {
     },
 
     sidebarFooterUsername: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeLabel,
         fontWeight: '700',
         width: 200,
@@ -1321,7 +1345,7 @@ const styles = {
     },
 
     sidebarFooterLink: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         textDecorationLine: 'none',
         fontFamily: fontFamily.EXP_NEUE,
@@ -1382,7 +1406,7 @@ const styles = {
     createMenuHeaderText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverMenuItem: {
@@ -1402,7 +1426,7 @@ const styles = {
 
     popoverMenuText: {
         fontSize: variables.fontSizeNormal,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverInnerContainer: {
@@ -1432,28 +1456,28 @@ const styles = {
     },
 
     sidebarLinkText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeNormal,
         textDecorationLine: 'none',
         overflow: 'hidden',
     },
 
     sidebarLinkHover: {
-        backgroundColor: themeColors.sidebarHover,
+        backgroundColor: theme.sidebarHover,
     },
 
     sidebarLinkActive: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         textDecorationLine: 'none',
     },
 
     sidebarLinkTextBold: {
         fontWeight: '700',
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     sidebarLinkActiveText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeNormal,
         textDecorationLine: 'none',
         overflow: 'hidden',
@@ -1466,7 +1490,7 @@ const styles = {
 
     optionDisplayName: {
         fontFamily: fontFamily.EXP_NEUE,
-        height: variables.alternateTextHeight,
+        minHeight: variables.alternateTextHeight,
         lineHeight: variables.lineHeightXLarge,
         ...whiteSpace.noWrap,
     },
@@ -1503,6 +1527,14 @@ const styles = {
         paddingBottom: 12,
     },
 
+    optionRowSelected: {
+        backgroundColor: theme.activeComponentBG,
+    },
+
+    optionRowDisabled: {
+        color: theme.textSupporting,
+    },
+
     optionRowCompact: {
         height: variables.optionRowHeightCompact,
         paddingTop: 12,
@@ -1514,8 +1546,14 @@ const styles = {
     },
 
     overlayStyles: (current) => ({
-        ...StyleSheet.absoluteFillObject,
-        backgroundColor: themeColors.overlay,
+        position: 'fixed',
+
+        // We need to stretch the overlay to cover the sidebar and the translate animation distance.
+        left: -2 * variables.sideBarWidth,
+        top: 0,
+        bottom: 0,
+        right: 0,
+        backgroundColor: theme.shadow,
         opacity: current.progress.interpolate({
             inputRange: [0, 1],
             outputRange: [0, variables.overlayOpacity],
@@ -1524,7 +1562,7 @@ const styles = {
     }),
 
     appContent: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         overflow: 'hidden',
     },
 
@@ -1597,7 +1635,7 @@ const styles = {
     },
 
     chatItemMessageHeaderSender: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -1607,13 +1645,13 @@ const styles = {
 
     chatItemMessageHeaderTimestamp: {
         flexShrink: 0,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         paddingTop: 2,
     },
 
     chatItemMessage: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         lineHeight: variables.lineHeightXLarge,
@@ -1632,15 +1670,15 @@ const styles = {
     },
 
     chatItemComposeBoxColor: {
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     chatItemComposeBoxFocusedColor: {
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
     },
 
     chatItemComposeBox: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusRounded,
         minHeight: variables.componentSizeMedium,
@@ -1655,7 +1693,7 @@ const styles = {
         paddingLeft: 20,
         paddingRight: 20,
         display: 'flex',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     chatFooterFullCompose: {
@@ -1683,9 +1721,9 @@ const styles = {
     // Make sure you run the following tests against any changes: #12669
     textInputCompose: addOutlineWidth(
         {
-            backgroundColor: themeColors.componentBG,
-            borderColor: themeColors.border,
-            color: themeColors.text,
+            backgroundColor: theme.componentBG,
+            borderColor: theme.border,
+            color: theme.text,
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
             borderWidth: 0,
@@ -1713,7 +1751,7 @@ const styles = {
     },
 
     editInputComposeSpacing: {
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         marginVertical: 8,
     },
 
@@ -1726,13 +1764,13 @@ const styles = {
 
     textInputComposeBorder: {
         borderLeftWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     chatItemSubmitButton: {
         alignSelf: 'flex-end',
         borderRadius: variables.componentBorderRadiusRounded,
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         height: 40,
         padding: 10,
         margin: 3,
@@ -1740,11 +1778,11 @@ const styles = {
     },
 
     emojiPickerContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
     },
 
     emojiHeaderContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         display: 'flex',
         height: CONST.EMOJI_PICKER_HEADER_HEIGHT,
         justifyContent: 'center',
@@ -1756,7 +1794,7 @@ const styles = {
         ...spacing.pv1,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeSmall,
     },
 
@@ -1776,17 +1814,18 @@ const styles = {
         paddingTop: 2,
         paddingBottom: 2,
         height: CONST.EMOJI_PICKER_ITEM_HEIGHT,
+        ...userSelect.userSelectNone,
     },
 
     emojiItemHighlighted: {
         transition: '0.2s ease',
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     emojiItemKeyboardHighlighted: {
         transition: '0.2s ease',
         borderWidth: 1,
-        borderColor: themeColors.link,
+        borderColor: theme.link,
         borderRadius: variables.buttonBorderRadius,
     },
 
@@ -1813,7 +1852,7 @@ const styles = {
     },
 
     hoveredButton: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
     },
 
     composerSizeButton: {
@@ -1823,13 +1862,13 @@ const styles = {
         padding: 6,
         margin: 3,
         borderRadius: variables.componentBorderRadiusRounded,
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         justifyContent: 'center',
     },
 
     chatItemAttachmentPlaceholder: {
-        backgroundColor: themeColors.sidebar,
-        borderColor: themeColors.border,
+        backgroundColor: theme.sidebar,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
         height: 150,
@@ -1867,7 +1906,7 @@ const styles = {
     exampleCheckImage: {
         width: '100%',
         height: 80,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
     },
@@ -1875,14 +1914,14 @@ const styles = {
     singleAvatar: {
         height: 24,
         width: 24,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 24,
     },
 
     singleSubscript: {
         height: variables.iconSizeNormal,
         width: variables.iconSizeNormal,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 20,
         zIndex: 1,
     },
@@ -1890,7 +1929,7 @@ const styles = {
     singleAvatarSmall: {
         height: 18,
         width: 18,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 18,
     },
 
@@ -1946,8 +1985,8 @@ const styles = {
         right: -25,
         borderWidth: 3,
         borderRadius: 18,
-        borderColor: themeColors.cardBorder,
-        backgroundColor: themeColors.appBG,
+        borderColor: theme.cardBorder,
+        backgroundColor: theme.appBG,
     },
 
     avatarLarge: {
@@ -1968,7 +2007,7 @@ const styles = {
     },
 
     avatarInnerText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeSmall,
         lineHeight: undefined,
         marginLeft: -3,
@@ -1976,7 +2015,7 @@ const styles = {
     },
 
     avatarInnerTextSmall: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeExtraSmall,
         lineHeight: undefined,
         marginLeft: -2,
@@ -1989,13 +2028,13 @@ const styles = {
     },
 
     avatar: {
-        backgroundColor: themeColors.sidebar,
-        borderColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
+        borderColor: theme.sidebar,
     },
 
     focusedAvatar: {
-        backgroundColor: themeColors.border,
-        borderColor: themeColors.border,
+        backgroundColor: theme.border,
+        borderColor: theme.border,
     },
 
     emptyAvatar: {
@@ -2051,26 +2090,26 @@ const styles = {
 
     borderTop: {
         borderTopWidth: variables.borderTopWidth,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderTopRounded: {
         borderTopWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderTopLeftRadius: variables.componentBorderRadiusNormal,
         borderTopRightRadius: variables.componentBorderRadiusNormal,
     },
 
     borderBottomRounded: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderBottomLeftRadius: variables.componentBorderRadiusNormal,
         borderBottomRightRadius: variables.componentBorderRadiusNormal,
     },
 
     borderBottom: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderNone: {
@@ -2080,12 +2119,12 @@ const styles = {
 
     borderRight: {
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderLeft: {
         borderLeftWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     pointerEventsNone,
@@ -2110,7 +2149,7 @@ const styles = {
 
     imageModalPDF: {
         flex: 1,
-        backgroundColor: themeColors.modalBackground,
+        backgroundColor: theme.modalBackground,
     },
 
     PDFView: {
@@ -2118,7 +2157,7 @@ const styles = {
         // It's being used on Web/Desktop only to vertically center short PDFs,
         // while preventing the overflow of the top of long PDF files.
         display: 'grid',
-        backgroundColor: themeColors.modalBackground,
+        backgroundColor: theme.modalBackground,
         width: '100%',
         height: '100%',
         justifyContent: 'center',
@@ -2143,7 +2182,7 @@ const styles = {
         flexDirection: 'column',
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.modalBackdrop,
+        backgroundColor: theme.modalBackdrop,
     },
 
     centeredModalStyles: (isSmallScreenWidth, isFullScreenWhenSmall) => ({
@@ -2159,10 +2198,10 @@ const styles = {
     },
 
     defaultAttachmentView: {
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         borderRadius: variables.componentBorderRadiusNormal,
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         flexDirection: 'row',
         padding: 20,
         alignItems: 'center',
@@ -2170,7 +2209,7 @@ const styles = {
 
     notFoundSafeArea: {
         flex: 1,
-        backgroundColor: themeColors.heading,
+        backgroundColor: theme.heading,
     },
 
     notFoundView: {
@@ -2192,7 +2231,7 @@ const styles = {
 
     notFoundTextHeader: {
         ...headlineFont,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
         marginTop: 20,
@@ -2201,14 +2240,14 @@ const styles = {
     },
 
     notFoundTextBody: {
-        color: themeColors.componentBG,
+        color: theme.componentBG,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
         fontSize: 15,
     },
 
     notFoundButtonText: {
-        color: themeColors.link,
+        color: theme.link,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
         fontSize: 15,
@@ -2219,8 +2258,8 @@ const styles = {
     },
 
     defaultModalContainer: {
-        backgroundColor: themeColors.componentBG,
-        borderColor: themeColors.transparent,
+        backgroundColor: theme.componentBG,
+        borderColor: theme.transparent,
     },
 
     reportActionContextMenuMiniButton: {
@@ -2277,7 +2316,7 @@ const styles = {
     },
 
     twoFactorAuthSection: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         padding: 0,
     },
 
@@ -2295,7 +2334,7 @@ const styles = {
         return {
             alignItems: 'center',
             justifyContent: 'center',
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
             paddingVertical: 28,
             borderRadius: 16,
             marginTop: 32,
@@ -2346,7 +2385,7 @@ const styles = {
             justifyContent: 'space-between',
         }),
         padding: 20,
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         borderRadius: variables.componentBorderRadiusLarge,
         overflow: 'hidden',
     }),
@@ -2366,7 +2405,7 @@ const styles = {
     anonymousRoomFooterLogoTaglineText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeMedium,
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
     signInButtonAvatar: {
         width: 80,
@@ -2382,9 +2421,9 @@ const styles = {
     },
 
     roomHeaderAvatar: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         borderRadius: 100,
-        borderColor: themeColors.componentBG,
+        borderColor: theme.componentBG,
         borderWidth: 4,
     },
 
@@ -2394,7 +2433,7 @@ const styles = {
         right: 0,
         bottom: 0,
         left: 0,
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         opacity: variables.overlayOpacity,
         borderRadius: 88,
     },
@@ -2403,7 +2442,7 @@ const styles = {
     RHPNavigatorContainerNavigatorContainerStyles: (isSmallScreenWidth) => ({marginLeft: isSmallScreenWidth ? 0 : variables.sideBarWidth, flex: 1}),
 
     avatarInnerTextChat: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeXLarge,
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
         textAlign: 'center',
@@ -2422,7 +2461,7 @@ const styles = {
         fontSize: variables.fontSizeLarge,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     pageWrapper: {
@@ -2447,12 +2486,12 @@ const styles = {
     selectCircle: {
         width: variables.componentSizeSmall,
         height: variables.componentSizeSmall,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentSizeSmall / 2,
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         marginLeft: 8,
     },
 
@@ -2471,7 +2510,7 @@ const styles = {
 
     unreadIndicatorLine: {
         height: 1,
-        backgroundColor: themeColors.unreadIndicator,
+        backgroundColor: theme.unreadIndicator,
         flexGrow: 1,
         marginRight: 8,
         opacity: 0.5,
@@ -2479,13 +2518,13 @@ const styles = {
 
     threadDividerLine: {
         height: 1,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         flexGrow: 1,
         marginHorizontal: 20,
     },
 
     unreadIndicatorText: {
-        color: themeColors.unreadIndicator,
+        color: theme.unreadIndicator,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeSmall,
         fontWeight: fontWeightBold,
@@ -2497,11 +2536,11 @@ const styles = {
     },
 
     navigationSceneContainer: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     navigationScreenCardStyle: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         height: '100%',
     },
 
@@ -2539,6 +2578,13 @@ const styles = {
         position: 'absolute',
     },
 
+    attachmentRevealButtonContainer: {
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        ...spacing.ph4,
+    },
+
     arrowIcon: {
         height: 40,
         width: 40,
@@ -2550,7 +2596,7 @@ const styles = {
 
     detailsPageSectionVersion: {
         alignSelf: 'center',
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         height: 24,
         lineHeight: 20,
@@ -2562,11 +2608,11 @@ const styles = {
         justifyContent: 'center',
         borderRadius: 20,
         padding: 15,
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     switchInactive: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
     },
 
     switchThumb: {
@@ -2575,7 +2621,7 @@ const styles = {
         borderRadius: 11,
         position: 'absolute',
         left: 4,
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     switchThumbTransformation: (translateX) => ({
@@ -2583,11 +2629,11 @@ const styles = {
     }),
 
     radioButtonContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         borderRadius: 10,
         height: 20,
         width: 20,
-        borderColor: themeColors.icon,
+        borderColor: theme.icon,
         borderWidth: 1,
         justifyContent: 'center',
         alignItems: 'center',
@@ -2601,7 +2647,7 @@ const styles = {
     },
 
     checkedContainer: {
-        backgroundColor: themeColors.checkBox,
+        backgroundColor: theme.checkBox,
     },
 
     magicCodeInputContainer: {
@@ -2612,7 +2658,7 @@ const styles = {
 
     magicCodeInput: {
         fontSize: variables.fontSizeXLarge,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2636,7 +2682,7 @@ const styles = {
     iouAmountText: {
         ...headlineFont,
         fontSize: variables.iouAmountTextSize,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2644,7 +2690,7 @@ const styles = {
         {
             ...headlineFont,
             fontSize: variables.iouAmountTextSize,
-            color: themeColors.heading,
+            color: theme.heading,
             padding: 0,
             lineHeight: undefined,
         },
@@ -2671,7 +2717,7 @@ const styles = {
     },
 
     moneyRequestPreviewBox: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         maxWidth: variables.sideBarWidth,
         width: '100%',
@@ -2681,6 +2727,10 @@ const styles = {
         padding: 16,
     },
 
+    amountSplitPadding: {
+        paddingTop: 2,
+    },
+
     moneyRequestPreviewBoxLoading: {
         // When a new IOU request arrives it is very briefly in a loading state, so set the minimum height of the container to 94 to match the rendered height after loading.
         // Otherwise, the IOU request pay button will not be fully visible and the user will have to scroll up to reveal the entire IOU request container.
@@ -2694,6 +2744,12 @@ const styles = {
         marginBottom: 0,
     },
 
+    moneyRequestPreviewAmount: {
+        ...headlineFont,
+        ...whiteSpace.preWrap,
+        color: theme.heading,
+    },
+
     defaultCheckmarkWrapper: {
         marginLeft: 8,
         alignSelf: 'center',
@@ -2737,7 +2793,7 @@ const styles = {
     },
 
     fullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'center',
         alignItems: 'center',
@@ -2745,12 +2801,12 @@ const styles = {
     },
 
     navigatorFullScreenLoading: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         opacity: 1,
     },
 
     reimbursementAccountFullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'flex-start',
         alignItems: 'center',
@@ -2798,12 +2854,12 @@ const styles = {
     }),
 
     growlNotificationBox: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
         borderRadius: variables.componentBorderRadiusNormal,
         alignItems: 'center',
         flexDirection: 'row',
         justifyContent: 'space-between',
-        shadowColor: themeColors.shadow,
+        shadowColor: theme.shadow,
         ...spacing.p5,
     },
 
@@ -2812,12 +2868,12 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         width: '90%',
         lineHeight: variables.fontSizeNormalHeight,
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         ...spacing.ml4,
     },
 
     blockquote: {
-        borderLeftColor: themeColors.border,
+        borderLeftColor: theme.border,
         borderLeftWidth: 4,
         paddingLeft: 12,
         marginVertical: 4,
@@ -2869,11 +2925,11 @@ const styles = {
 
     smallEditIcon: {
         alignItems: 'center',
-        backgroundColor: themeColors.buttonHoveredBG,
-        borderColor: themeColors.textReversed,
+        backgroundColor: theme.buttonHoveredBG,
+        borderColor: theme.textReversed,
         borderRadius: 14,
         borderWidth: 3,
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         height: 28,
         width: 28,
         justifyContent: 'center',
@@ -2890,7 +2946,7 @@ const styles = {
         height: 400,
         borderRadius: variables.componentBorderRadiusCard,
         overflow: 'hidden',
-        backgroundColor: themeColors.heroCard,
+        backgroundColor: theme.heroCard,
     },
 
     workspaceCardMobile: {
@@ -2933,18 +2989,18 @@ const styles = {
     },
 
     peopleRowBorderBottom: {
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderBottomWidth: 1,
         ...spacing.pb2,
     },
 
     peopleBadge: {
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         ...spacing.ph3,
     },
 
     peopleBadgeText: {
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightNormal,
         ...whiteSpace.noWrap,
@@ -2970,7 +3026,7 @@ const styles = {
             flex: 1,
         },
         text: {
-            color: themeColors.textSupporting,
+            color: theme.textSupporting,
             textAlignVertical: 'center',
             fontSize: variables.fontSizeLabel,
         },
@@ -2990,7 +3046,7 @@ const styles = {
     },
 
     cardOverlay: {
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         position: 'absolute',
         top: 0,
         left: 0,
@@ -3007,18 +3063,18 @@ const styles = {
 
     shortTermsBorder: {
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     shortTermsHorizontalRule: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh3,
     },
 
     shortTermsLargeHorizontalRule: {
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh3,
     },
 
@@ -3041,7 +3097,7 @@ const styles = {
     shortTermsHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXXXLarge,
         lineHeight: variables.lineHeightXXXLarge,
     },
@@ -3053,7 +3109,7 @@ const styles = {
 
     collapsibleSectionBorder: {
         borderBottomWidth: 2,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
     },
 
     communicationsLinkHeight: {
@@ -3104,11 +3160,11 @@ const styles = {
 
     googleSearchSeparator: {
         height: 1,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
     },
 
     googleSearchText: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         lineHeight: variables.fontSizeNormalHeight,
         fontFamily: fontFamily.EXP_NEUE,
@@ -3146,7 +3202,7 @@ const styles = {
     keyboardShortcutTableContainer: {
         display: 'flex',
         width: '100%',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         height: 'auto',
         borderRadius: variables.componentBorderRadius,
         borderWidth: 1,
@@ -3155,7 +3211,7 @@ const styles = {
     keyboardShortcutTableRow: {
         flex: 1,
         flexDirection: 'row',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         flexBasis: 'auto',
         alignSelf: 'stretch',
         borderTopWidth: 1,
@@ -3164,7 +3220,7 @@ const styles = {
     keyboardShortcutTablePrefix: {
         width: '30%',
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     keyboardShortcutTableFirstRow: {
@@ -3172,18 +3228,18 @@ const styles = {
     },
 
     iPhoneXSafeArea: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
         flex: 1,
     },
 
     transferBalancePayment: {
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     transferBalanceSelectedPayment: {
-        borderColor: themeColors.iconSuccessFill,
+        borderColor: theme.iconSuccessFill,
     },
 
     transferBalanceBalance: {
@@ -3198,7 +3254,7 @@ const styles = {
         overflow: 'hidden',
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.imageCropBackgroundColor,
+        backgroundColor: theme.imageCropBackgroundColor,
         ...cursor.cursorMove,
     },
 
@@ -3209,7 +3265,7 @@ const styles = {
     },
 
     sliderKnob: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         position: 'absolute',
         height: variables.sliderKnobSize,
         width: variables.sliderKnobSize,
@@ -3219,7 +3275,7 @@ const styles = {
     },
 
     sliderBar: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         height: variables.sliderBarHeight,
         borderRadius: variables.sliderBarHeight / 2,
         alignSelf: 'stretch',
@@ -3234,7 +3290,7 @@ const styles = {
     },
 
     inlineSystemMessage: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         fontFamily: fontFamily.EXP_NEUE,
         marginLeft: 6,
@@ -3249,17 +3305,17 @@ const styles = {
     },
 
     invisibleOverlay: {
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         zIndex: 1000,
     },
 
     reportDropOverlay: {
-        backgroundColor: themeColors.dropUIBG,
+        backgroundColor: theme.dropUIBG,
         zIndex: 2,
     },
 
     receiptDropOverlay: {
-        backgroundColor: themeColors.receiptDropUIBG,
+        backgroundColor: theme.receiptDropUIBG,
         zIndex: 2,
     },
 
@@ -3269,7 +3325,7 @@ const styles = {
     }),
 
     cardSection: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusCard,
         marginBottom: 20,
         marginHorizontal: 16,
@@ -3291,7 +3347,7 @@ const styles = {
     },
 
     callRequestSection: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         paddingHorizontal: 0,
         paddingBottom: 0,
         marginHorizontal: 0,
@@ -3313,7 +3369,7 @@ const styles = {
         flex: 1,
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     deeplinkWrapperMessage: {
@@ -3338,7 +3394,7 @@ const styles = {
     emojiReactionListHeader: {
         marginTop: 8,
         paddingBottom: 20,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
         borderBottomWidth: 1,
         marginHorizontal: 20,
     },
@@ -3346,7 +3402,7 @@ const styles = {
         paddingVertical: 2,
         paddingHorizontal: 8,
         borderRadius: 28,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         alignItems: 'center',
         justifyContent: 'center',
         flexDirection: 'row',
@@ -3359,7 +3415,7 @@ const styles = {
         paddingHorizontal: 20,
     },
     reactionListHeaderText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         marginLeft: 8,
         alignSelf: 'center',
     },
@@ -3381,7 +3437,7 @@ const styles = {
     },
 
     fontColorReactionLabel: {
-        color: '#586A64',
+        color: theme.tooltipSupportingText,
     },
 
     reactionEmojiTitle: {
@@ -3390,7 +3446,7 @@ const styles = {
     },
 
     textReactionSenders: {
-        color: themeColors.dark,
+        color: theme.tooltipPrimaryText,
         ...wordBreak.breakWord,
     },
 
@@ -3412,7 +3468,7 @@ const styles = {
     },
 
     validateCodeDigits: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeXXLarge,
         letterSpacing: 4,
@@ -3433,14 +3489,14 @@ const styles = {
 
     footerTitle: {
         fontSize: variables.fontSizeLarge,
-        color: themeColors.success,
+        color: theme.success,
         marginBottom: 16,
     },
 
     footerRow: {
         paddingVertical: 4,
         marginBottom: 8,
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeMedium,
     },
 
@@ -3451,7 +3507,7 @@ const styles = {
 
     listPickerSeparator: {
         height: 1,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     datePickerRoot: {
@@ -3460,7 +3516,7 @@ const styles = {
     },
 
     datePickerPopover: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         width: '100%',
         alignSelf: 'center',
         zIndex: 100,
@@ -3469,7 +3525,7 @@ const styles = {
 
     loginHeroHeader: {
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
-        color: themeColors.success,
+        color: theme.success,
         fontWeight: '500',
         textAlign: 'center',
     },
@@ -3483,14 +3539,14 @@ const styles = {
     loginHeroBody: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSignInHeroBody,
-        color: themeColors.textLight,
+        color: theme.textLight,
         textAlign: 'center',
     },
 
     linkPreviewWrapper: {
         marginTop: 16,
         borderLeftWidth: 4,
-        borderLeftColor: themeColors.border,
+        borderLeftColor: theme.border,
         paddingLeft: 12,
     },
 
@@ -3512,7 +3568,7 @@ const styles = {
     },
 
     whisper: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
     },
 
     contextMenuItemPopoverMaxWidth: {
@@ -3547,7 +3603,7 @@ const styles = {
     taskTitleDescription: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         lineHeight: variables.lineHeightNormal,
         ...spacing.mb1,
     },
@@ -3559,7 +3615,7 @@ const styles = {
 
     reportHorizontalRule: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh5,
         ...spacing.mv2,
     },
@@ -3590,13 +3646,13 @@ const styles = {
         paddingVertical: 20,
         borderRadius: 20,
         overflow: 'hidden',
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
         borderWidth: 2,
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
     },
 
     splashScreenHider: {
-        backgroundColor: themeColors.splashBG,
+        backgroundColor: theme.splashBG,
         alignItems: 'center',
         justifyContent: 'center',
     },
@@ -3674,8 +3730,8 @@ const styles = {
     },
 
     tabSelectorButton: {
-        height: 40,
-        padding: 12,
+        height: variables.tabSelectorButtonHeight,
+        padding: variables.tabSelectorButtonPadding,
         flexDirection: 'row',
         alignItems: 'center',
         justifyContent: 'center',
@@ -3692,7 +3748,7 @@ const styles = {
         marginLeft: 8,
         fontFamily: isSelected ? fontFamily.EXP_NEUE_BOLD : fontFamily.EXP_NEUE,
         fontWeight: isSelected ? fontWeightBold : 400,
-        color: isSelected ? themeColors.textLight : themeColors.textSupporting,
+        color: isSelected ? theme.textLight : theme.textSupporting,
     }),
 
     /**
@@ -3710,6 +3766,15 @@ const styles = {
         right: 0,
     }),
 
+    dualColorOverscrollSpacer: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        width: '100%',
+        height: '100%',
+        zIndex: -1,
+    },
+
     willChangeTransform: {
         willChange: 'transform',
     },
@@ -3733,7 +3798,7 @@ const styles = {
 
     emojiPickerButtonDropdown: {
         justifyContent: 'center',
-        backgroundColor: themeColors.activeComponentBG,
+        backgroundColor: theme.activeComponentBG,
         width: 86,
         height: 52,
         borderRadius: 26,
@@ -3755,15 +3820,15 @@ const styles = {
     },
 
     reportPreviewBox: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         maxWidth: variables.sideBarWidth,
         width: '100%',
     },
 
     reportPreviewBoxHoverBorder: {
-        borderColor: themeColors.border,
-        backgroundColor: themeColors.border,
+        borderColor: theme.border,
+        backgroundColor: theme.border,
     },
 
     reportPreviewBoxBody: {
@@ -3772,17 +3837,17 @@ const styles = {
 
     reportActionItemImages: {
         flexDirection: 'row',
-        borderWidth: 2,
-        borderColor: themeColors.cardBG,
+        borderWidth: 4,
+        borderColor: theme.transparent,
         borderTopLeftRadius: variables.componentBorderRadiusLarge,
         borderTopRightRadius: variables.componentBorderRadiusLarge,
+        borderBottomLeftRadius: variables.componentBorderRadiusLarge,
+        borderBottomRightRadius: variables.componentBorderRadiusLarge,
         overflow: 'hidden',
         height: 200,
     },
 
     reportActionItemImage: {
-        borderWidth: 1,
-        borderColor: themeColors.cardBG,
         flex: 1,
         width: '100%',
         height: '100%',
@@ -3791,10 +3856,15 @@ const styles = {
         alignItems: 'center',
     },
 
+    reportActionItemImageBorder: {
+        borderRightWidth: 2,
+        borderColor: theme.cardBG,
+    },
+
     reportActionItemImagesMore: {
         position: 'absolute',
         borderRadius: 18,
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         width: 36,
         height: 36,
         display: 'flex',
@@ -3803,10 +3873,14 @@ const styles = {
     },
 
     moneyRequestHeaderStatusBarBadge: {
-        padding: 8,
-        borderRadius: variables.componentBorderRadiusMedium,
-        marginRight: 16,
-        backgroundColor: themeColors.border,
+        paddingHorizontal: 8,
+        borderRadius: variables.componentBorderRadiusSmall,
+        height: variables.inputHeightSmall,
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: theme.border,
+        marginRight: 12,
     },
 
     staticHeaderImage: {
@@ -3828,7 +3902,7 @@ const styles = {
     sidebarStatusAvatarContainer: {
         height: 44,
         width: 84,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         flexDirection: 'row',
         alignItems: 'center',
         justifyContent: 'space-between',
@@ -3848,7 +3922,7 @@ const styles = {
         ...spacing.mv3,
         overflow: 'hidden',
         borderWidth: 2,
-        borderColor: themeColors.cardBG,
+        borderColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         height: 200,
         maxWidth: 400,
@@ -3856,7 +3930,7 @@ const styles = {
 
     distanceRequestContainer: (maxHeight) => ({
         ...flex.flexShrink2,
-        minHeight: variables.baseMenuItemHeight,
+        minHeight: variables.optionRowHeight * 2,
         maxHeight,
     }),
 
@@ -3874,13 +3948,35 @@ const styles = {
         overflow: 'hidden',
     },
 
+    mapViewOverlay: {
+        flex: 1,
+        position: 'absolute',
+        left: 0,
+        top: 0,
+        borderRadius: variables.componentBorderRadiusLarge,
+        overflow: 'hidden',
+        backgroundColor: theme.highlightBG,
+        ...sizing.w100,
+        ...sizing.h100,
+    },
+
+    confirmationListMapItem: {
+        ...spacing.m5,
+        height: 200,
+    },
+
     mapDirection: {
-        width: 7,
-        color: Colors.green,
+        lineColor: theme.success,
+        lineWidth: 7,
+    },
+
+    mapDirectionLayer: {
+        layout: {'line-join': 'round', 'line-cap': 'round'},
+        paint: {'line-color': theme.success, 'line-width': 7},
     },
 
     mapPendingView: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         ...flex.flex1,
         borderRadius: variables.componentBorderRadiusLarge,
     },
@@ -3892,6 +3988,14 @@ const styles = {
         height: 30,
         width: '100%',
     },
-};
+});
+
+// For now we need to export the styles function that takes the theme as an argument
+// as something named different than "styles", because a lot of files import the "defaultStyles"
+// as "styles", which causes ESLint to throw an error.
+// TODO: Remove "stylesGenerator" and instead only return "styles" once the app is migrated to theme switching hooks and HOCs and "styles/theme/default.js" is not used anywhere anymore (GH issue: https://github.com/Expensify/App/issues/27337)
+const stylesGenerator = styles;
+const defaultStyles = styles(defaultTheme);
 
-export default styles;
+export default defaultStyles;
+export {stylesGenerator};
diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
index 111b01a3385a..c101a668666b 100644
--- a/src/styles/themes/default.js
+++ b/src/styles/themes/default.js
@@ -5,71 +5,68 @@ import ROUTES from '../../ROUTES';
 
 const darkTheme = {
     // Figma keys
-    appBG: colors.greenAppBackground,
-    splashBG: colors.green,
-    highlightBG: colors.greenHighlightBackground,
-    border: colors.greenBorders,
-    borderLighter: colors.greenBordersLighter,
-    borderFocus: colors.green,
-    icon: colors.greenIcons,
-    iconMenu: colors.green,
-    iconHovered: colors.white,
-    iconSuccessFill: colors.green,
-    iconReversed: colors.greenAppBackground,
+    appBG: colors.darkAppBackground,
+    splashBG: colors.green400,
+    highlightBG: colors.darkHighlightBackground,
+    border: colors.darkBorders,
+    borderLighter: colors.darkDefaultButton,
+    borderFocus: colors.green400,
+    icon: colors.darkIcons,
+    iconMenu: colors.green400,
+    iconHovered: colors.darkPrimaryText,
+    iconSuccessFill: colors.green400,
+    iconReversed: colors.darkAppBackground,
     iconColorfulBackground: `${colors.ivory}cc`,
-    textSupporting: colors.greenSupportingText,
-    text: colors.white,
+    textSupporting: colors.darkSupportingText,
+    text: colors.darkPrimaryText,
     textColorfulBackground: colors.ivory,
-    link: colors.blueLink,
-    linkHover: colors.blueLinkHover,
-    buttonDefaultBG: colors.greenDefaultButton,
-    buttonDisabledBG: colors.greenDefaultButtonDisabled,
-    buttonHoveredBG: colors.greenDefaultButtonHover,
-    buttonPressedBG: colors.greenDefaultButtonPressed,
+    link: colors.blue300,
+    linkHover: colors.blue100,
+    buttonDefaultBG: colors.darkDefaultButton,
+    buttonHoveredBG: colors.darkDefaultButtonHover,
+    buttonPressedBG: colors.darkDefaultButtonPressed,
     danger: colors.red,
     dangerHover: colors.redHover,
     dangerPressed: colors.redHover,
-    warning: colors.yellow,
-    success: colors.green,
+    warning: colors.yellow400,
+    success: colors.green400,
     successHover: colors.greenHover,
     successPressed: colors.greenPressed,
     transparent: colors.transparent,
-    midtone: colors.green700,
     signInPage: colors.green800,
-    dark: colors.midnight,
 
     // Additional keys
-    overlay: colors.greenHighlightBackground,
-    inverse: colors.white,
+    overlay: colors.darkHighlightBackground,
+    inverse: colors.darkPrimaryText,
     shadow: colors.black,
-    componentBG: colors.greenAppBackground,
-    hoverComponentBG: colors.greenHighlightBackground,
-    activeComponentBG: colors.greenBorders,
+    componentBG: colors.darkAppBackground,
+    hoverComponentBG: colors.darkHighlightBackground,
+    activeComponentBG: colors.darkBorders,
     signInSidebar: colors.green800,
-    sidebar: colors.greenHighlightBackground,
-    sidebarHover: colors.greenAppBackground,
-    heading: colors.white,
-    textLight: colors.white,
-    textDark: colors.greenAppBackground,
-    textReversed: colors.greenAppBackground,
-    textBackground: colors.greenHighlightBackground,
-    textMutedReversed: colors.greenIcons,
+    sidebar: colors.darkHighlightBackground,
+    sidebarHover: colors.darkAppBackground,
+    heading: colors.darkPrimaryText,
+    textLight: colors.darkPrimaryText,
+    textDark: colors.darkAppBackground,
+    textReversed: colors.lightPrimaryText,
+    textBackground: colors.darkHighlightBackground,
+    textMutedReversed: colors.darkIcons,
     textError: colors.red,
-    offline: colors.greenIcons,
-    modalBackdrop: colors.greenHighlightBackground,
-    modalBackground: colors.greenAppBackground,
-    cardBG: colors.greenHighlightBackground,
-    cardBorder: colors.greenHighlightBackground,
-    spinner: colors.greenSupportingText,
-    unreadIndicator: colors.green,
-    placeholderText: colors.greenIcons,
-    heroCard: colors.blue,
-    uploadPreviewActivityIndicator: colors.greenHighlightBackground,
+    offline: colors.darkIcons,
+    modalBackdrop: colors.darkHighlightBackground,
+    modalBackground: colors.darkAppBackground,
+    cardBG: colors.darkHighlightBackground,
+    cardBorder: colors.darkHighlightBackground,
+    spinner: colors.darkSupportingText,
+    unreadIndicator: colors.green400,
+    placeholderText: colors.darkIcons,
+    heroCard: colors.blue400,
+    uploadPreviewActivityIndicator: colors.darkHighlightBackground,
     dropUIBG: 'rgba(6,27,9,0.92)',
     receiptDropUIBG: 'rgba(3, 212, 124, 0.84)',
-    checkBox: colors.green,
-    pickerOptionsTextColor: colors.white,
-    imageCropBackgroundColor: colors.greenIcons,
+    checkBox: colors.green400,
+    pickerOptionsTextColor: colors.darkPrimaryText,
+    imageCropBackgroundColor: colors.darkIcons,
     fallbackIconColor: colors.green700,
     reactionActiveBackground: colors.green600,
     reactionActiveText: colors.green100,
@@ -79,6 +76,11 @@ const darkTheme = {
     mentionBG: colors.blue600,
     ourMentionText: colors.green100,
     ourMentionBG: colors.green600,
+    tooltipSupportingText: colors.lightSupportingText,
+    tooltipPrimaryText: colors.lightPrimaryText,
+    skeletonLHNIn: colors.darkBorders,
+    skeletonLHNOut: colors.darkDefaultButton,
+    QRLogo: colors.green400,
     starDefaultBG: 'rgb(254, 228, 94)',
 };
 
@@ -86,65 +88,9 @@ darkTheme.PAGE_BACKGROUND_COLORS = {
     [SCREENS.HOME]: darkTheme.sidebar,
     [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
     [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
-    [ROUTES.I_KNOW_A_TEACHER]: colors.orange800,
-};
-
-const oldTheme = {
-    shadow: colors.black,
-    link: colors.blue,
-    linkHover: colors.blueHover,
-    componentBG: colors.white,
-    hoverComponentBG: colors.gray1,
-    activeComponentBG: colors.gray2,
-    appBG: colors.white,
-    heading: colors.dark,
-    sidebar: colors.gray1,
-    sidebarHover: colors.white,
-    border: colors.gray2,
-    borderFocus: colors.blue,
-    icon: colors.gray3,
-    iconMenu: colors.gray3,
-    iconHovered: colors.dark,
-    iconSuccessFill: colors.green,
-    iconReversed: colors.white,
-    textSupporting: colors.gray4,
-    text: colors.dark,
-    textError: colors.oldRed,
-    textBackground: colors.gray1,
-    textReversed: colors.white,
-    textMutedReversed: colors.gray3,
-    buttonDefaultBG: colors.gray2,
-    offline: colors.gray3,
-    modalBackdrop: colors.gray3,
-    modalBackground: colors.gray2,
-    buttonDisabledBG: colors.gray2,
-    buttonHoveredBG: colors.gray1,
-    buttonPressedBG: colors.gray2,
-    spinner: colors.gray4,
-    unreadIndicator: colors.green,
-    placeholderText: colors.gray3,
-    heroCard: colors.blue,
-    uploadPreviewActivityIndicator: colors.gray1,
-    dropUIBG: 'rgba(6,27,9,0.92)',
-    cardBG: colors.gray1,
-    cardBorder: colors.gray1,
-    checkBox: colors.blue,
-    overlay: colors.gray1,
-
-    // Merging new Keys for Dark Mode merge. Delete after new branding is implemented.
-    highlightBG: colors.gray1,
-    danger: colors.oldRed,
-    dangerHover: colors.oldRedHover,
-    dangerPressed: colors.oldRedHover,
-    dangerDisabled: colors.oldRedDisabled,
-    warning: colors.yellow,
-    success: colors.green,
-    successHover: colors.greenHover,
-    successPressed: colors.greenPressed,
-    transparent: colors.transparent,
-    inverse: colors.dark,
-    textLight: colors.white,
-    textDark: colors.dark,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
+    [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
+    [ROUTES.SETTINGS_SECURITY]: colors.ice500,
 };
 
 export default darkTheme;
diff --git a/src/styles/themes/light.js b/src/styles/themes/light.js
new file mode 100644
index 000000000000..1a945cb84913
--- /dev/null
+++ b/src/styles/themes/light.js
@@ -0,0 +1,95 @@
+import colors from '../colors';
+import SCREENS from '../../SCREENS';
+import ROUTES from '../../ROUTES';
+
+const lightTheme = {
+    // Figma keys
+    appBG: colors.lightAppBackground,
+    splashBG: colors.green400,
+    highlightBG: colors.lightHighlightBackground,
+    border: colors.lightBorders,
+    borderLighter: colors.lightDefaultButtonPressed,
+    borderFocus: colors.green400,
+    icon: colors.lightIcons,
+    iconMenu: colors.green400,
+    iconHovered: colors.lightPrimaryText,
+    iconSuccessFill: colors.green400,
+    iconReversed: colors.lightAppBackground,
+    iconColorfulBackground: `${colors.ivory}cc`,
+    textColorfulBackground: colors.ivory,
+    textSupporting: colors.lightSupportingText,
+    text: colors.lightPrimaryText,
+    link: colors.blue600,
+    linkHover: colors.blue500,
+    buttonDefaultBG: colors.lightDefaultButton,
+    buttonHoveredBG: colors.lightDefaultButtonHover,
+    buttonPressedBG: colors.lightDefaultButtonPressed,
+    danger: colors.red,
+    dangerHover: colors.redHover,
+    dangerPressed: colors.redHover,
+    warning: colors.yellow400,
+    success: colors.green400,
+    successHover: colors.greenHover,
+    successPressed: colors.greenPressed,
+    transparent: colors.transparent,
+    signInPage: colors.green800,
+
+    // Additional keys
+    overlay: colors.lightHighlightBackground,
+    inverse: colors.lightPrimaryText,
+    shadow: colors.black,
+    componentBG: colors.lightAppBackground,
+    hoverComponentBG: colors.lightHighlightBackground,
+    activeComponentBG: colors.lightBorders,
+    signInSidebar: colors.green800,
+    sidebar: colors.lightHighlightBackground,
+    sidebarHover: colors.lightBorders,
+    heading: colors.lightPrimaryText,
+    textLight: colors.white,
+    textDark: colors.lightPrimaryText,
+    textReversed: colors.darkPrimaryText,
+    textBackground: colors.lightHighlightBackground,
+    textMutedReversed: colors.lightIcons,
+    textError: colors.red,
+    offline: colors.lightIcons,
+    modalBackdrop: colors.lightHighlightBackground,
+    modalBackground: colors.lightAppBackground,
+    cardBG: colors.lightHighlightBackground,
+    cardBorder: colors.lightHighlightBackground,
+    spinner: colors.lightSupportingText,
+    unreadIndicator: colors.green400,
+    placeholderText: colors.lightIcons,
+    heroCard: colors.blue400,
+    uploadPreviewActivityIndicator: colors.lightHighlightBackground,
+    dropUIBG: 'rgba(252, 251, 249, 0.92)',
+    dropTransparentOverlay: 'rgba(255,255,255,0)',
+    checkBox: colors.green400,
+    pickerOptionsTextColor: colors.lightPrimaryText,
+    imageCropBackgroundColor: colors.lightIcons,
+    fallbackIconColor: colors.green700,
+    reactionActiveBackground: colors.green100,
+    reactionActiveText: colors.green600,
+    badgeAdHoc: colors.pink600,
+    badgeAdHocHover: colors.pink700,
+    mentionText: colors.blue600,
+    mentionBG: colors.blue100,
+    ourMentionText: colors.green600,
+    ourMentionBG: colors.green100,
+    tooltipSupportingText: colors.darkSupportingText,
+    tooltipPrimaryText: colors.darkPrimaryText,
+    skeletonLHNIn: colors.lightBorders,
+    skeletonLHNOut: colors.lightDefaultButtonPressed,
+    QRLogo: colors.green400,
+    starDefaultBG: 'rgb(254, 228, 94)',
+};
+
+lightTheme.PAGE_BACKGROUND_COLORS = {
+    [SCREENS.HOME]: lightTheme.sidebar,
+    [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
+    [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
+    [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
+    [ROUTES.SETTINGS_SECURITY]: colors.ice500,
+};
+
+export default lightTheme;
diff --git a/src/styles/useThemeStyles.js b/src/styles/useThemeStyles.ts
similarity index 61%
rename from src/styles/useThemeStyles.js
rename to src/styles/useThemeStyles.ts
index 77ee0edb6f95..a5b3baebbaec 100644
--- a/src/styles/useThemeStyles.js
+++ b/src/styles/useThemeStyles.ts
@@ -8,6 +8,8 @@ function useThemeStyles() {
         throw new Error('StylesContext was null! Are you sure that you wrapped the component under a <ThemeStylesProvider>?');
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return themeStyles;
 }
 
diff --git a/src/styles/utilities/cursor/index.native.js b/src/styles/utilities/cursor/index.native.ts
similarity index 72%
rename from src/styles/utilities/cursor/index.native.js
rename to src/styles/utilities/cursor/index.native.ts
index 95704e55b07a..67416e750f36 100644
--- a/src/styles/utilities/cursor/index.native.js
+++ b/src/styles/utilities/cursor/index.native.ts
@@ -1,4 +1,6 @@
-export default {
+import CursorStyles from './types';
+
+const cursor: CursorStyles = {
     cursorDefault: {},
     cursorDisabled: {},
     cursorPointer: {},
@@ -11,3 +13,5 @@ export default {
     cursorInitial: {},
     cursorText: {},
 };
+
+export default cursor;
diff --git a/src/styles/utilities/cursor/index.js b/src/styles/utilities/cursor/index.ts
similarity index 86%
rename from src/styles/utilities/cursor/index.js
rename to src/styles/utilities/cursor/index.ts
index 00f7f9a7b1e3..e3f85107f16a 100644
--- a/src/styles/utilities/cursor/index.js
+++ b/src/styles/utilities/cursor/index.ts
@@ -1,4 +1,6 @@
-export default {
+import CursorStyles from './types';
+
+const cursor: CursorStyles = {
     cursorDefault: {
         cursor: 'default',
     },
@@ -33,3 +35,5 @@ export default {
         cursor: 'text',
     },
 };
+
+export default cursor;
diff --git a/src/styles/utilities/cursor/types.ts b/src/styles/utilities/cursor/types.ts
new file mode 100644
index 000000000000..9ca20c5ae123
--- /dev/null
+++ b/src/styles/utilities/cursor/types.ts
@@ -0,0 +1,18 @@
+import {CSSProperties} from 'react';
+
+type CursorStylesKeys =
+    | 'cursorDefault'
+    | 'cursorDisabled'
+    | 'cursorPointer'
+    | 'cursorMove'
+    | 'cursorUnset'
+    | 'cursorAuto'
+    | 'cursorZoomIn'
+    | 'cursorGrabbing'
+    | 'cursorZoomOut'
+    | 'cursorInitial'
+    | 'cursorText';
+
+type CursorStyles = Record<CursorStylesKeys, Partial<Pick<CSSProperties, 'cursor'>>>;
+
+export default CursorStyles;
diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.ts
similarity index 81%
rename from src/styles/utilities/display.js
rename to src/styles/utilities/display.ts
index bcef1c6b565f..868c2bdb0e3b 100644
--- a/src/styles/utilities/display.js
+++ b/src/styles/utilities/display.ts
@@ -1,3 +1,6 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
+
 /**
  * Display utilities with Bootstrap inspired naming.
  *
@@ -28,4 +31,4 @@ export default {
     dBlock: {
         display: 'block',
     },
-};
+} satisfies Record<string, ViewStyle | CSSProperties>;
diff --git a/src/styles/utilities/overflow.ts b/src/styles/utilities/overflow.ts
index 3961758e40bf..48807283c9b4 100644
--- a/src/styles/utilities/overflow.ts
+++ b/src/styles/utilities/overflow.ts
@@ -1,5 +1,6 @@
 import {CSSProperties} from 'react';
 import overflowAuto from './overflowAuto';
+import overscrollBehaviorContain from './overscrollBehaviorContain';
 
 /**
  * Overflow utility styles with Bootstrap inspired naming.
@@ -23,5 +24,7 @@ export default {
         overscrollBehaviorX: 'none',
     },
 
+    overscrollBehaviorContain,
+
     overflowAuto,
 } satisfies Record<string, CSSProperties>;
diff --git a/src/styles/utilities/overscrollBehaviorContain/index.js b/src/styles/utilities/overscrollBehaviorContain/index.js
new file mode 100644
index 000000000000..1377e4b47d28
--- /dev/null
+++ b/src/styles/utilities/overscrollBehaviorContain/index.js
@@ -0,0 +1,3 @@
+export default {
+    overscrollBehavior: 'contain',
+};
diff --git a/src/styles/pointerEventsNone/index.native.js b/src/styles/utilities/overscrollBehaviorContain/index.native.js
similarity index 100%
rename from src/styles/pointerEventsNone/index.native.js
rename to src/styles/utilities/overscrollBehaviorContain/index.native.js
diff --git a/src/styles/utilities/positioning.ts b/src/styles/utilities/positioning.ts
index fc505e4cb608..651d2a12f2ea 100644
--- a/src/styles/utilities/positioning.ts
+++ b/src/styles/utilities/positioning.ts
@@ -47,4 +47,7 @@ export default {
     b0: {
         bottom: 0,
     },
+    b2: {
+        bottom: 8,
+    },
 } satisfies Record<string, ViewStyle>;
diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.ts
similarity index 97%
rename from src/styles/utilities/spacing.js
rename to src/styles/utilities/spacing.ts
index 47b523d89ac2..a3667f05ac06 100644
--- a/src/styles/utilities/spacing.js
+++ b/src/styles/utilities/spacing.ts
@@ -1,3 +1,5 @@
+import {ViewStyle} from 'react-native';
+
 /**
  * Spacing utility styles with Bootstrap inspired naming.
  * All styles should be incremented by units of 4.
@@ -371,6 +373,10 @@ export default {
         paddingRight: 8,
     },
 
+    pr3: {
+        paddingRight: 12,
+    },
+
     pr4: {
         paddingRight: 16,
     },
@@ -506,4 +512,4 @@ export default {
     gap7: {
         gap: 28,
     },
-};
+} satisfies Record<string, ViewStyle>;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index f584e657c693..6291323cef0b 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -25,7 +25,7 @@ export default {
     componentBorderRadiusLarge: 16,
     componentBorderRadiusCard: 12,
     componentBorderRadiusRounded: 24,
-    downloadAppModalAppIconSize: 48,
+    appModalAppIconSize: 48,
     buttonBorderRadius: 100,
     avatarSizeLargeBordered: 88,
     avatarSizeLarge: 80,
@@ -70,11 +70,12 @@ export default {
     iconSizeXLarge: 28,
     iconSizeExtraLarge: 40,
     iconSizeSuperLarge: 60,
+    iconSizeUltraLarge: 120,
     emojiSize: 20,
     emojiLineHeight: 28,
     iouAmountTextSize: 40,
     extraSmallMobileResponsiveWidthBreakpoint: 320,
-    extraSmallMobileResponsiveHeightBreakpoint: 550,
+    extraSmallMobileResponsiveHeightBreakpoint: 667,
     mobileResponsiveWidthBreakpoint: 800,
     modalFullscreenBackdropOpacity: 0.5,
     tabletResponsiveWidthBreakpoint: 1024,
@@ -88,6 +89,7 @@ export default {
     optionRowHeightCompact: 52,
     optionsListSectionHeaderHeight: getValueUsingPixelRatio(32, 38),
     overlayOpacity: 0.6,
+    lineHeightXSmall: getValueUsingPixelRatio(11, 17),
     lineHeightSmall: getValueUsingPixelRatio(14, 16),
     lineHeightNormal: getValueUsingPixelRatio(16, 21),
     lineHeightLarge: getValueUsingPixelRatio(18, 24),
@@ -133,6 +135,8 @@ export default {
     signInLogoWidth: 120,
     signInLogoWidthLargeScreen: 144,
     signInLogoWidthPill: 132,
+    tabSelectorButtonHeight: 40,
+    tabSelectorButtonPadding: 12,
     lhnLogoWidth: 108,
     lhnLogoHeight: 28,
     signInLogoWidthLargeScreenPill: 162,
@@ -151,5 +155,7 @@ export default {
     pressDimValue: 0.8,
     qrShareHorizontalPadding: 32,
 
-    baseMenuItemHeight: 64,
+    moneyRequestSkeletonHeight: 107,
+
+    distanceScrollEventThrottle: 16,
 } as const;
diff --git a/src/types/modules/react-native.d.ts b/src/types/modules/react-native.d.ts
new file mode 100644
index 000000000000..1b0b39e5f67d
--- /dev/null
+++ b/src/types/modules/react-native.d.ts
@@ -0,0 +1,9 @@
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+import 'react-native';
+
+declare module 'react-native' {
+    interface TextInput {
+        // Typescript type declaration is missing in React Native for setting text selection.
+        setSelection: (start: number, end: number) => void;
+    }
+}
diff --git a/src/types/onyx/Account.ts b/src/types/onyx/Account.ts
index 29f21d703466..85b0c2359702 100644
--- a/src/types/onyx/Account.ts
+++ b/src/types/onyx/Account.ts
@@ -2,6 +2,8 @@ import {ValueOf} from 'type-fest';
 import CONST from '../../CONST';
 import * as OnyxCommon from './OnyxCommon';
 
+type TwoFactorAuthStep = ValueOf<typeof CONST.TWO_FACTOR_AUTH_STEPS> | '';
+
 type Account = {
     /** URL to the assigned guide's appointment booking calendar */
     guideCalendarLink?: string;
@@ -47,6 +49,9 @@ type Account = {
 
     errors?: OnyxCommon.Errors;
     success?: string;
+    codesAreCopied?: boolean;
+    twoFactorAuthStep?: TwoFactorAuthStep;
 };
 
 export default Account;
+export type {TwoFactorAuthStep};
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 71ef3d4d98e7..e89c966d49da 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -1,32 +1,22 @@
-type AdditionalData = {
-    isBillingCard?: boolean;
-    isP2PDebitCard?: boolean;
-};
-
-type AccountData = {
-    additionalData?: AdditionalData;
-    addressName?: string;
-    addressState?: string;
-    addressStreet?: string;
-    addressZip?: number;
-    cardMonth?: number;
+import {ValueOf} from 'type-fest';
+import CONST from '../../CONST';
+import * as OnyxCommon from './OnyxCommon';
 
-    /** The masked credit card number */
-    cardNumber?: string;
-
-    cardYear?: number;
-    created?: string;
-    currency?: string;
-    fundID?: number;
-};
+type State = 3 /* OPEN */ | 4 /* NOT_ACTIVATED */ | 5 /* STATE_DEACTIVATED */ | 6 /* CLOSED */ | 7 /* STATE_SUSPENDED */;
 
 type Card = {
-    accountData?: AccountData;
-    accountType?: string;
-    description?: string;
-    key?: string;
-    methodID?: number;
-    title?: string;
+    cardID: number;
+    state: State;
+    bank: string;
+    availableSpend: number;
+    domainName: string;
+    maskedPan: string;
+    cardName: string;
+    isVirtual: boolean;
+    fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
+    cardholderFirstName: string;
+    cardholderLastName: string;
+    errors?: OnyxCommon.Errors;
 };
 
 export default Card;
diff --git a/src/types/onyx/Fund.ts b/src/types/onyx/Fund.ts
new file mode 100644
index 000000000000..7c7c0445081a
--- /dev/null
+++ b/src/types/onyx/Fund.ts
@@ -0,0 +1,32 @@
+type AdditionalData = {
+    isBillingCard?: boolean;
+    isP2PDebitCard?: boolean;
+};
+
+type AccountData = {
+    additionalData?: AdditionalData;
+    addressName?: string;
+    addressState?: string;
+    addressStreet?: string;
+    addressZip?: number;
+    cardMonth?: number;
+
+    /** The masked credit card number */
+    cardNumber?: string;
+
+    cardYear?: number;
+    created?: string;
+    currency?: string;
+    fundID?: number;
+};
+
+type Fund = {
+    accountData?: AccountData;
+    accountType?: string;
+    description?: string;
+    key?: string;
+    methodID?: number;
+    title?: string;
+};
+
+export default Fund;
diff --git a/src/types/onyx/IOU.ts b/src/types/onyx/IOU.ts
index 373b5d990160..7151bb84d1f1 100644
--- a/src/types/onyx/IOU.ts
+++ b/src/types/onyx/IOU.ts
@@ -13,7 +13,13 @@ type IOU = {
     /** Selected Currency Code of the current IOU */
     currency?: string;
     comment?: string;
+    merchant?: string;
+    created?: string;
+    receiptPath?: string;
+    receiptSource?: string;
+    transactionID?: string;
     participants?: Participant[];
+    tag?: string;
 };
 
 export default IOU;
diff --git a/src/types/onyx/OnyxUpdatesFromServer.ts b/src/types/onyx/OnyxUpdatesFromServer.ts
new file mode 100644
index 000000000000..50b1503b90bd
--- /dev/null
+++ b/src/types/onyx/OnyxUpdatesFromServer.ts
@@ -0,0 +1,19 @@
+import {OnyxUpdate} from 'react-native-onyx';
+import Request from './Request';
+import Response from './Response';
+
+type OnyxUpdateEvent = {
+    eventType: string;
+    data: OnyxUpdate[];
+};
+
+type OnyxUpdatesFromServer = {
+    type: 'https' | 'pusher';
+    lastUpdateID: number | string;
+    previousUpdateID: number | string;
+    request?: Request;
+    response?: Response;
+    updates?: OnyxUpdateEvent[];
+};
+
+export type {OnyxUpdatesFromServer, OnyxUpdateEvent};
diff --git a/src/types/onyx/Paypal.ts b/src/types/onyx/Paypal.ts
deleted file mode 100644
index 26236a63b7fc..000000000000
--- a/src/types/onyx/Paypal.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import CONST from '../../CONST';
-import * as OnyxCommon from './OnyxCommon';
-
-type PaypalAccountData = {
-    username: string;
-};
-
-type Paypal = {
-    /** This is always 'PayPal.me' */
-    title: string;
-
-    /** The paypalMe address */
-    description: string;
-
-    /** This is always 'payPalMe' */
-    methodID: typeof CONST.PAYMENT_METHODS.PAYPAL;
-
-    /** This is always 'payPalMe' */
-    accountType: typeof CONST.PAYMENT_METHODS.PAYPAL;
-
-    key: string;
-    isDefault: boolean;
-    pendingAction?: OnyxCommon.PendingAction;
-    accountData: PaypalAccountData;
-};
-
-export default Paypal;
diff --git a/src/types/onyx/PolicyCategory.ts b/src/types/onyx/PolicyCategory.ts
new file mode 100644
index 000000000000..adaf16e1acec
--- /dev/null
+++ b/src/types/onyx/PolicyCategory.ts
@@ -0,0 +1,22 @@
+type PolicyCategory = {
+    /** Name of a category */
+    name: string;
+
+    /** Flag that determines if a category is active and able to be selected */
+    enabled: boolean;
+
+    /** If true, not adding a comment to a transaction with this category will trigger a violation */
+    areCommentsRequired: boolean;
+
+    /** "General Ledger code" that corresponds to this category in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+
+    /** An ID for this category from an external accounting system */
+    externalID: string;
+
+    /** The external accounting service that this category comes from */
+    origin: string;
+};
+
+export default PolicyCategory;
diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
new file mode 100644
index 000000000000..fe6bee3a1f31
--- /dev/null
+++ b/src/types/onyx/PolicyTag.ts
@@ -0,0 +1,13 @@
+type PolicyTag = {
+    /** Name of a Tag */
+    name: string;
+
+    /** Flag that determines if a tag is active and able to be selected */
+    enabled: boolean;
+
+    /** "General Ledger code" that corresponds to this tag in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+};
+
+export default PolicyTag;
diff --git a/src/types/onyx/QueuedOnyxUpdates.ts b/src/types/onyx/QueuedOnyxUpdates.ts
deleted file mode 100644
index 40daa2e09335..000000000000
--- a/src/types/onyx/QueuedOnyxUpdates.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import Onyx from 'react-native-onyx';
-
-type QueuedOnyxUpdates = Array<typeof Onyx.update>;
-
-export default QueuedOnyxUpdates;
diff --git a/src/types/onyx/RecentlyUsedCategories.ts b/src/types/onyx/RecentlyUsedCategories.ts
new file mode 100644
index 000000000000..d251b16f8667
--- /dev/null
+++ b/src/types/onyx/RecentlyUsedCategories.ts
@@ -0,0 +1,3 @@
+type RecentlyUsedCategories = string[];
+
+export default RecentlyUsedCategories;
diff --git a/src/types/onyx/RecentlyUsedTags.ts b/src/types/onyx/RecentlyUsedTags.ts
new file mode 100644
index 000000000000..1d6112514609
--- /dev/null
+++ b/src/types/onyx/RecentlyUsedTags.ts
@@ -0,0 +1,3 @@
+type RecentlyUsedTags = Record<string, string[]>;
+
+export default RecentlyUsedTags;
diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index e730dfd807fb..94f14af0ddb3 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -1,8 +1,12 @@
+import {OnyxUpdate} from 'react-native-onyx';
+
 type Request = {
-    command?: string;
+    command: string;
     data?: Record<string, unknown>;
     type?: string;
     shouldUseSecure?: boolean;
+    successData?: OnyxUpdate[];
+    failureData?: OnyxUpdate[];
 };
 
 export default Request;
diff --git a/src/types/onyx/Response.ts b/src/types/onyx/Response.ts
new file mode 100644
index 000000000000..c501034e971c
--- /dev/null
+++ b/src/types/onyx/Response.ts
@@ -0,0 +1,11 @@
+import {OnyxUpdate} from 'react-native-onyx';
+
+type Response = {
+    previousUpdateID?: number | string;
+    lastUpdateID?: number | string;
+    jsonCode?: number;
+    onyxData?: OnyxUpdate[];
+    requestID?: string;
+};
+
+export default Response;
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 0e0c7a423829..4326920ab51f 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -1,12 +1,27 @@
+import {ValueOf} from 'type-fest';
 import * as OnyxCommon from './OnyxCommon';
+import CONST from '../../CONST';
 
 type Comment = {
     comment?: string;
 };
 
+type Geometry = {
+    coordinates: number[][];
+    type: 'LineString';
+};
+
+type Route = {
+    distance: number;
+    geometry: Geometry;
+};
+
+type Routes = Record<string, Route>;
+
 type Transaction = {
     transactionID: string;
     amount: number;
+    category?: string;
     currency: string;
     reportID: string;
     comment: Comment;
@@ -17,6 +32,12 @@ type Transaction = {
     modifiedAmount?: number;
     modifiedCreated?: string;
     modifiedCurrency?: string;
+    receipt: {
+        receiptID?: number;
+        source?: string;
+        state?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
+    };
+    routes?: Routes;
 };
 
 export default Transaction;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 8d48eccf1464..8711a0d208ef 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -1,7 +1,6 @@
 import Account from './Account';
 import Request from './Request';
 import Credentials from './Credentials';
-import QueuedOnyxUpdates from './QueuedOnyxUpdates';
 import IOU from './IOU';
 import Modal from './Modal';
 import Network from './Network';
@@ -15,7 +14,6 @@ import User from './User';
 import Login from './Login';
 import Session from './Session';
 import Beta from './Beta';
-import Paypal from './Paypal';
 import BlockedFromConcierge from './BlockedFromConcierge';
 import PlaidData from './PlaidData';
 import UserWallet from './UserWallet';
@@ -24,6 +22,7 @@ import WalletAdditionalDetails from './WalletAdditionalDetails';
 import WalletTerms from './WalletTerms';
 import BankAccount from './BankAccount';
 import Card from './Card';
+import Fund from './Fund';
 import WalletStatement from './WalletStatement';
 import PersonalBankAccount from './PersonalBankAccount';
 import FrequentlyUsedEmoji from './FrequentlyUsedEmoji';
@@ -32,9 +31,11 @@ import ReimbursementAccountDraft from './ReimbursementAccountDraft';
 import WalletTransfer from './WalletTransfer';
 import ReceiptModal from './ReceiptModal';
 import MapboxAccessToken from './MapboxAccessToken';
+import {OnyxUpdatesFromServer, OnyxUpdateEvent} from './OnyxUpdatesFromServer';
 import Download from './Download';
 import PolicyMember from './PolicyMember';
 import Policy from './Policy';
+import PolicyCategory from './PolicyCategory';
 import Report from './Report';
 import ReportAction from './ReportAction';
 import ReportActionReactions from './ReportActionReactions';
@@ -42,12 +43,14 @@ import SecurityGroup from './SecurityGroup';
 import Transaction from './Transaction';
 import Form, {AddDebitCardForm} from './Form';
 import RecentWaypoints from './RecentWaypoints';
+import RecentlyUsedCategories from './RecentlyUsedCategories';
+import RecentlyUsedTags from './RecentlyUsedTags';
+import PolicyTag from './PolicyTag';
 
 export type {
     Account,
     Request,
     Credentials,
-    QueuedOnyxUpdates,
     IOU,
     Modal,
     Network,
@@ -61,7 +64,6 @@ export type {
     Login,
     Session,
     Beta,
-    Paypal,
     BlockedFromConcierge,
     PlaidData,
     UserWallet,
@@ -70,6 +72,7 @@ export type {
     WalletTerms,
     BankAccount,
     Card,
+    Fund,
     WalletStatement,
     PersonalBankAccount,
     ReimbursementAccount,
@@ -81,6 +84,7 @@ export type {
     Download,
     PolicyMember,
     Policy,
+    PolicyCategory,
     Report,
     ReportAction,
     ReportActionReactions,
@@ -88,5 +92,10 @@ export type {
     Transaction,
     Form,
     AddDebitCardForm,
+    OnyxUpdatesFromServer,
+    OnyxUpdateEvent,
     RecentWaypoints,
+    RecentlyUsedCategories,
+    RecentlyUsedTags,
+    PolicyTag,
 };
diff --git a/src/types/utils/CustomRefObject.ts b/src/types/utils/CustomRefObject.ts
new file mode 100644
index 000000000000..aa726d7a0f86
--- /dev/null
+++ b/src/types/utils/CustomRefObject.ts
@@ -0,0 +1,5 @@
+import {RefObject} from 'react';
+
+type CustomRefObject<T> = RefObject<T> & {onselectstart: () => boolean};
+
+export default CustomRefObject;
diff --git a/tests/actions/IOUTest.js b/tests/actions/IOUTest.js
index 6fbbe19cec8e..afb06cdb6fb3 100644
--- a/tests/actions/IOUTest.js
+++ b/tests/actions/IOUTest.js
@@ -9,6 +9,7 @@ import DateUtils from '../../src/libs/DateUtils';
 import * as NumberUtils from '../../src/libs/NumberUtils';
 import * as ReportActions from '../../src/libs/actions/ReportActions';
 import * as Report from '../../src/libs/actions/Report';
+import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
 
 const CARLOS_EMAIL = 'cmartins@expensifail.com';
 const CARLOS_ACCOUNT_ID = 1;
@@ -19,6 +20,7 @@ const RORY_ACCOUNT_ID = 3;
 const VIT_EMAIL = 'vit@expensifail.com';
 const VIT_ACCOUNT_ID = 4;
 
+OnyxUpdateManager();
 describe('actions/IOU', () => {
     beforeAll(() => {
         Onyx.init({
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
index c06d3bc83766..978186fcf9c4 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.js
@@ -14,6 +14,7 @@ import * as PersistedRequests from '../../src/libs/actions/PersistedRequests';
 import * as User from '../../src/libs/actions/User';
 import * as ReportUtils from '../../src/libs/ReportUtils';
 import DateUtils from '../../src/libs/DateUtils';
+import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
 
 jest.mock('../../src/libs/actions/Report', () => {
     const originalModule = jest.requireActual('../../src/libs/actions/Report');
@@ -24,6 +25,7 @@ jest.mock('../../src/libs/actions/Report', () => {
     };
 });
 
+OnyxUpdateManager();
 describe('actions/Report', () => {
     beforeAll(() => {
         PusherHelper.setup();
diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js
index d8bfa144e358..59a7441679ea 100644
--- a/tests/actions/SessionTest.js
+++ b/tests/actions/SessionTest.js
@@ -7,6 +7,7 @@ import * as TestHelper from '../utils/TestHelper';
 import CONST from '../../src/CONST';
 import PushNotification from '../../src/libs/Notification/PushNotification';
 import * as App from '../../src/libs/actions/App';
+import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -24,6 +25,7 @@ Onyx.init({
     registerStorageEventListener: () => {},
 });
 
+OnyxUpdateManager();
 beforeEach(() => Onyx.clear().then(waitForPromisesToResolve));
 
 describe('Session', () => {
diff --git a/tests/perf-test/SelectionList.perf-test.js b/tests/perf-test/SelectionList.perf-test.js
index 82cec956713f..cdf9492e0ff3 100644
--- a/tests/perf-test/SelectionList.perf-test.js
+++ b/tests/perf-test/SelectionList.perf-test.js
@@ -21,6 +21,12 @@ jest.mock('../../src/components/withLocalize', () => (Component) => (props) => (
     />
 ));
 
+jest.mock('../../src/hooks/useNetwork', () =>
+    jest.fn(() => ({
+        isOffline: false,
+    })),
+);
+
 jest.mock('../../src/components/withKeyboardState', () => (Component) => (props) => (
     <Component
         // eslint-disable-next-line react/jsx-props-no-spreading
@@ -29,6 +35,12 @@ jest.mock('../../src/components/withKeyboardState', () => (Component) => (props)
     />
 ));
 
+jest.mock('@react-navigation/native', () => ({
+    useFocusEffect: () => {},
+    useIsFocused: () => true,
+    createNavigationContainerRef: jest.fn(),
+}));
+
 function SelectionListWrapper(args) {
     const [selectedIds, setSelectedIds] = useState([]);
 
diff --git a/tests/unit/CIGitLogicTest.sh b/tests/unit/CIGitLogicTest.sh
index 12060c3445e9..e9ec20bb74a6 100755
--- a/tests/unit/CIGitLogicTest.sh
+++ b/tests/unit/CIGitLogicTest.sh
@@ -135,8 +135,10 @@ function cherry_pick_pr {
 
   git switch staging
   git switch -c cherry-pick-staging
-  git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs "$PR_MERGE_COMMIT"
   git cherry-pick -x --mainline 1 "$VERSION_BUMP_COMMIT"
+  setup_git_as_human
+  git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs "$PR_MERGE_COMMIT"
+  setup_git_as_osbotify
 
   git switch staging
   git merge cherry-pick-staging --no-ff -m "Merge pull request #$(($1 + 1)) from Expensify/cherry-pick-staging"
diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.js
index c8dcda0e2af5..7d8c4f23197c 100644
--- a/tests/unit/NetworkTest.js
+++ b/tests/unit/NetworkTest.js
@@ -14,6 +14,7 @@ import Log from '../../src/libs/Log';
 import * as MainQueue from '../../src/libs/Network/MainQueue';
 import * as App from '../../src/libs/actions/App';
 import NetworkConnection from '../../src/libs/NetworkConnection';
+import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
 
 jest.mock('../../src/libs/Log');
 jest.useFakeTimers();
@@ -22,6 +23,7 @@ Onyx.init({
     keys: ONYXKEYS,
 });
 
+OnyxUpdateManager();
 const originalXHR = HttpUtils.xhr;
 
 beforeEach(() => {
diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
index 663e76a9c1f1..f1a251e4e433 100644
--- a/tests/unit/OptionsListUtilsTest.js
+++ b/tests/unit/OptionsListUtilsTest.js
@@ -652,6 +652,652 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails[0].text).toBe('Spider-Man');
     });
 
+    it('getNewChatOptions() for categories', () => {
+        const search = 'Food';
+        const emptySearch = '';
+        const wrongSearch = 'bla bla';
+        const recentlyUsedCategories = ['Taxi', 'Restaurant'];
+        const selectedOptions = [
+            {
+                name: 'Medical',
+            },
+        ];
+        const smallCategoriesList = {
+            Taxi: {
+                enabled: false,
+                name: 'Taxi',
+            },
+            Restaurant: {
+                enabled: true,
+                name: 'Restaurant',
+            },
+            Food: {
+                enabled: true,
+                name: 'Food',
+            },
+            'Food: Meat': {
+                enabled: true,
+                name: 'Food: Meat',
+            },
+        };
+        const smallResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Taxi',
+                        keyForList: 'Taxi',
+                        searchText: 'Taxi',
+                        tooltipText: 'Taxi',
+                        isDisabled: true,
+                    },
+                    {
+                        text: 'Restaurant',
+                        keyForList: 'Restaurant',
+                        searchText: 'Restaurant',
+                        tooltipText: 'Restaurant',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food',
+                        keyForList: 'Food',
+                        searchText: 'Food',
+                        tooltipText: 'Food',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '    Meat',
+                        keyForList: 'Meat',
+                        searchText: 'Food: Meat',
+                        tooltipText: 'Meat',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const smallSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Food',
+                        keyForList: 'Food',
+                        searchText: 'Food',
+                        tooltipText: 'Food',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food: Meat',
+                        keyForList: 'Food: Meat',
+                        searchText: 'Food: Meat',
+                        tooltipText: 'Food: Meat',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const smallWrongSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [],
+            },
+        ];
+        const largeCategoriesList = {
+            Taxi: {
+                enabled: false,
+                name: 'Taxi',
+            },
+            Restaurant: {
+                enabled: true,
+                name: 'Restaurant',
+            },
+            Food: {
+                enabled: true,
+                name: 'Food',
+            },
+            'Food: Meat': {
+                enabled: true,
+                name: 'Food: Meat',
+            },
+            'Food: Milk': {
+                enabled: true,
+                name: 'Food: Milk',
+            },
+            'Food: Vegetables': {
+                enabled: false,
+                name: 'Food: Vegetables',
+            },
+            'Cars: Audi': {
+                enabled: true,
+                name: 'Cars: Audi',
+            },
+            'Cars: BMW': {
+                enabled: false,
+                name: 'Cars: BMW',
+            },
+            'Cars: Mercedes-Benz': {
+                enabled: true,
+                name: 'Cars: Mercedes-Benz',
+            },
+            Medical: {
+                enabled: false,
+                name: 'Medical',
+            },
+            'Travel: Meals': {
+                enabled: true,
+                name: 'Travel: Meals',
+            },
+            'Travel: Meals: Breakfast': {
+                enabled: true,
+                name: 'Travel: Meals: Breakfast',
+            },
+            'Travel: Meals: Dinner': {
+                enabled: false,
+                name: 'Travel: Meals: Dinner',
+            },
+            'Travel: Meals: Lunch': {
+                enabled: true,
+                name: 'Travel: Meals: Lunch',
+            },
+        };
+        const largeResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Medical',
+                        keyForList: 'Medical',
+                        searchText: 'Medical',
+                        tooltipText: 'Medical',
+                        isDisabled: true,
+                    },
+                ],
+            },
+            {
+                title: 'Recent',
+                shouldShow: true,
+                indexOffset: 1,
+                data: [
+                    {
+                        text: 'Taxi',
+                        keyForList: 'Taxi',
+                        searchText: 'Taxi',
+                        tooltipText: 'Taxi',
+                        isDisabled: true,
+                    },
+                    {
+                        text: 'Restaurant',
+                        keyForList: 'Restaurant',
+                        searchText: 'Restaurant',
+                        tooltipText: 'Restaurant',
+                        isDisabled: false,
+                    },
+                ],
+            },
+            {
+                title: 'All',
+                shouldShow: true,
+                indexOffset: 3,
+                data: [
+                    {
+                        text: 'Taxi',
+                        keyForList: 'Taxi',
+                        searchText: 'Taxi',
+                        tooltipText: 'Taxi',
+                        isDisabled: true,
+                    },
+                    {
+                        text: 'Restaurant',
+                        keyForList: 'Restaurant',
+                        searchText: 'Restaurant',
+                        tooltipText: 'Restaurant',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food',
+                        keyForList: 'Food',
+                        searchText: 'Food',
+                        tooltipText: 'Food',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '    Meat',
+                        keyForList: 'Meat',
+                        searchText: 'Food: Meat',
+                        tooltipText: 'Meat',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '    Milk',
+                        keyForList: 'Milk',
+                        searchText: 'Food: Milk',
+                        tooltipText: 'Milk',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '    Vegetables',
+                        keyForList: 'Vegetables',
+                        searchText: 'Food: Vegetables',
+                        tooltipText: 'Vegetables',
+                        isDisabled: true,
+                    },
+                    {
+                        text: 'Cars',
+                        keyForList: 'Cars',
+                        searchText: 'Cars',
+                        tooltipText: 'Cars',
+                        isDisabled: true,
+                    },
+                    {
+                        text: '    Audi',
+                        keyForList: 'Audi',
+                        searchText: 'Cars: Audi',
+                        tooltipText: 'Audi',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '    BMW',
+                        keyForList: 'BMW',
+                        searchText: 'Cars: BMW',
+                        tooltipText: 'BMW',
+                        isDisabled: true,
+                    },
+                    {
+                        text: '    Mercedes-Benz',
+                        keyForList: 'Mercedes-Benz',
+                        searchText: 'Cars: Mercedes-Benz',
+                        tooltipText: 'Mercedes-Benz',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Travel',
+                        keyForList: 'Travel',
+                        searchText: 'Travel',
+                        tooltipText: 'Travel',
+                        isDisabled: true,
+                    },
+                    {
+                        text: '    Meals',
+                        keyForList: 'Meals',
+                        searchText: 'Travel: Meals',
+                        tooltipText: 'Meals',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '        Breakfast',
+                        keyForList: 'Breakfast',
+                        searchText: 'Travel: Meals: Breakfast',
+                        tooltipText: 'Breakfast',
+                        isDisabled: false,
+                    },
+                    {
+                        text: '        Dinner',
+                        keyForList: 'Dinner',
+                        searchText: 'Travel: Meals: Dinner',
+                        tooltipText: 'Dinner',
+                        isDisabled: true,
+                    },
+                    {
+                        text: '        Lunch',
+                        keyForList: 'Lunch',
+                        searchText: 'Travel: Meals: Lunch',
+                        tooltipText: 'Lunch',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const largeSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Food',
+                        keyForList: 'Food',
+                        searchText: 'Food',
+                        tooltipText: 'Food',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food: Meat',
+                        keyForList: 'Food: Meat',
+                        searchText: 'Food: Meat',
+                        tooltipText: 'Food: Meat',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food: Milk',
+                        keyForList: 'Food: Milk',
+                        searchText: 'Food: Milk',
+                        tooltipText: 'Food: Milk',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food: Vegetables',
+                        keyForList: 'Food: Vegetables',
+                        searchText: 'Food: Vegetables',
+                        tooltipText: 'Food: Vegetables',
+                        isDisabled: true,
+                    },
+                ],
+            },
+        ];
+        const largeWrongSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [],
+            },
+        ];
+
+        const smallResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], emptySearch, [], [], false, false, true, smallCategoriesList);
+        expect(smallResult.categoryOptions).toStrictEqual(smallResultList);
+
+        const smallSearchResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], search, [], [], false, false, true, smallCategoriesList);
+        expect(smallSearchResult.categoryOptions).toStrictEqual(smallSearchResultList);
+
+        const smallWrongSearchResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], wrongSearch, [], [], false, false, true, smallCategoriesList);
+        expect(smallWrongSearchResult.categoryOptions).toStrictEqual(smallWrongSearchResultList);
+
+        const largeResult = OptionsListUtils.getNewChatOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            emptySearch,
+            selectedOptions,
+            [],
+            false,
+            false,
+            true,
+            largeCategoriesList,
+            recentlyUsedCategories,
+        );
+        expect(largeResult.categoryOptions).toStrictEqual(largeResultList);
+
+        const largeSearchResult = OptionsListUtils.getNewChatOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            search,
+            selectedOptions,
+            [],
+            false,
+            false,
+            true,
+            largeCategoriesList,
+            recentlyUsedCategories,
+        );
+        expect(largeSearchResult.categoryOptions).toStrictEqual(largeSearchResultList);
+
+        const largeWrongSearchResult = OptionsListUtils.getNewChatOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            wrongSearch,
+            selectedOptions,
+            [],
+            false,
+            false,
+            true,
+            largeCategoriesList,
+            recentlyUsedCategories,
+        );
+        expect(largeWrongSearchResult.categoryOptions).toStrictEqual(largeWrongSearchResultList);
+    });
+
+    it('getCategoryOptionTree()', () => {
+        const categories = {
+            Taxi: {
+                enabled: false,
+                name: 'Taxi',
+            },
+            Restaurant: {
+                enabled: true,
+                name: 'Restaurant',
+            },
+            Food: {
+                enabled: true,
+                name: 'Food',
+            },
+            'Food: Meat': {
+                enabled: true,
+                name: 'Food: Meat',
+            },
+            'Food: Milk': {
+                enabled: true,
+                name: 'Food: Milk',
+            },
+            'Food: Vegetables': {
+                enabled: false,
+                name: 'Food: Vegetables',
+            },
+            'Cars: Audi': {
+                enabled: true,
+                name: 'Cars: Audi',
+            },
+            'Cars: BMW': {
+                enabled: false,
+                name: 'Cars: BMW',
+            },
+            'Cars: Mercedes-Benz': {
+                enabled: true,
+                name: 'Cars: Mercedes-Benz',
+            },
+            Medical: {
+                enabled: false,
+                name: 'Medical',
+            },
+            'Travel: Meals': {
+                enabled: true,
+                name: 'Travel: Meals',
+            },
+            'Travel: Meals: Breakfast': {
+                enabled: true,
+                name: 'Travel: Meals: Breakfast',
+            },
+            'Travel: Meals: Dinner': {
+                enabled: false,
+                name: 'Travel: Meals: Dinner',
+            },
+            'Travel: Meals: Lunch': {
+                enabled: true,
+                name: 'Travel: Meals: Lunch',
+            },
+            Plain: {
+                enabled: true,
+                name: 'Plain',
+            },
+            Health: {
+                enabled: true,
+                name: 'Health',
+            },
+            'A: B: C': {
+                enabled: true,
+                name: 'A: B: C',
+            },
+            'A: B: C: D: E': {
+                enabled: true,
+                name: 'A: B: C: D: E',
+            },
+        };
+        const result = [
+            {
+                text: 'Taxi',
+                keyForList: 'Taxi',
+                searchText: 'Taxi',
+                tooltipText: 'Taxi',
+                isDisabled: true,
+            },
+            {
+                text: 'Restaurant',
+                keyForList: 'Restaurant',
+                searchText: 'Restaurant',
+                tooltipText: 'Restaurant',
+                isDisabled: false,
+            },
+            {
+                text: 'Food',
+                keyForList: 'Food',
+                searchText: 'Food',
+                tooltipText: 'Food',
+                isDisabled: false,
+            },
+            {
+                text: '    Meat',
+                keyForList: 'Meat',
+                searchText: 'Food: Meat',
+                tooltipText: 'Meat',
+                isDisabled: false,
+            },
+            {
+                text: '    Milk',
+                keyForList: 'Milk',
+                searchText: 'Food: Milk',
+                tooltipText: 'Milk',
+                isDisabled: false,
+            },
+            {
+                text: '    Vegetables',
+                keyForList: 'Vegetables',
+                searchText: 'Food: Vegetables',
+                tooltipText: 'Vegetables',
+                isDisabled: true,
+            },
+            {
+                text: 'Cars',
+                keyForList: 'Cars',
+                searchText: 'Cars',
+                tooltipText: 'Cars',
+                isDisabled: true,
+            },
+            {
+                text: '    Audi',
+                keyForList: 'Audi',
+                searchText: 'Cars: Audi',
+                tooltipText: 'Audi',
+                isDisabled: false,
+            },
+            {
+                text: '    BMW',
+                keyForList: 'BMW',
+                searchText: 'Cars: BMW',
+                tooltipText: 'BMW',
+                isDisabled: true,
+            },
+            {
+                text: '    Mercedes-Benz',
+                keyForList: 'Mercedes-Benz',
+                searchText: 'Cars: Mercedes-Benz',
+                tooltipText: 'Mercedes-Benz',
+                isDisabled: false,
+            },
+            {
+                text: 'Medical',
+                keyForList: 'Medical',
+                searchText: 'Medical',
+                tooltipText: 'Medical',
+                isDisabled: true,
+            },
+            {
+                text: 'Travel',
+                keyForList: 'Travel',
+                searchText: 'Travel',
+                tooltipText: 'Travel',
+                isDisabled: true,
+            },
+            {
+                text: '    Meals',
+                keyForList: 'Meals',
+                searchText: 'Travel: Meals',
+                tooltipText: 'Meals',
+                isDisabled: false,
+            },
+            {
+                text: '        Breakfast',
+                keyForList: 'Breakfast',
+                searchText: 'Travel: Meals: Breakfast',
+                tooltipText: 'Breakfast',
+                isDisabled: false,
+            },
+            {
+                text: '        Dinner',
+                keyForList: 'Dinner',
+                searchText: 'Travel: Meals: Dinner',
+                tooltipText: 'Dinner',
+                isDisabled: true,
+            },
+            {
+                text: '        Lunch',
+                keyForList: 'Lunch',
+                searchText: 'Travel: Meals: Lunch',
+                tooltipText: 'Lunch',
+                isDisabled: false,
+            },
+            {
+                text: 'Plain',
+                keyForList: 'Plain',
+                searchText: 'Plain',
+                tooltipText: 'Plain',
+                isDisabled: false,
+            },
+            {
+                text: 'Health',
+                keyForList: 'Health',
+                searchText: 'Health',
+                tooltipText: 'Health',
+                isDisabled: false,
+            },
+            {
+                text: 'A',
+                keyForList: 'A',
+                searchText: 'A',
+                tooltipText: 'A',
+                isDisabled: true,
+            },
+            {
+                text: '    B',
+                keyForList: 'B',
+                searchText: 'A: B',
+                tooltipText: 'B',
+                isDisabled: true,
+            },
+            {
+                text: '        C',
+                keyForList: 'C',
+                searchText: 'A: B: C',
+                tooltipText: 'C',
+                isDisabled: false,
+            },
+            {
+                text: '            D',
+                keyForList: 'D',
+                searchText: 'A: B: C: D',
+                tooltipText: 'D',
+                isDisabled: true,
+            },
+            {
+                text: '                E',
+                keyForList: 'E',
+                searchText: 'A: B: C: D: E',
+                tooltipText: 'E',
+                isDisabled: false,
+            },
+        ];
+
+        expect(OptionsListUtils.getCategoryOptionTree(categories)).toStrictEqual(result);
+    });
+
     it('formatMemberForList()', () => {
         const formattedMembers = _.map(PERSONAL_DETAILS, (personalDetail, key) => OptionsListUtils.formatMemberForList(personalDetail, key === '1'));
 
diff --git a/tests/unit/TranslateTest.js b/tests/unit/TranslateTest.js
index 9ac23d6b81b0..45d4a12b61f5 100644
--- a/tests/unit/TranslateTest.js
+++ b/tests/unit/TranslateTest.js
@@ -7,19 +7,19 @@ const CONST = require('../../src/CONST').default;
 
 const originalTranslations = _.clone(translations);
 translations.default = {
-    [CONST.LOCALES.EN]: {
+    [CONST.LOCALES.EN]: translations.flattenObject({
         testKey1: 'English',
         testKey2: 'Test Word 2',
         testKey3: 'Test Word 3',
         testKeyGroup: {
             testFunction: ({testVariable}) => `With variable ${testVariable}`,
         },
-    },
-    [CONST.LOCALES.ES]: {
+    }),
+    [CONST.LOCALES.ES]: translations.flattenObject({
         testKey1: 'Spanish',
         testKey2: 'Spanish Word 2',
-    },
-    [CONST.LOCALES.ES_ES]: {testKey1: 'Spanish ES'},
+    }),
+    [CONST.LOCALES.ES_ES]: translations.flattenObject({testKey1: 'Spanish ES'}),
 };
 
 describe('translate', () => {
@@ -38,14 +38,12 @@ describe('translate', () => {
 
     test('Test when key is not found in default', () => {
         expect(() => Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toThrow(Error);
-        expect(() => Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toThrow(Error);
     });
 
     test('Test when key is not found in default (Production Mode)', () => {
         const ORIGINAL_IS_IN_PRODUCTION = CONFIG.default.IS_IN_PRODUCTION;
         CONFIG.default.IS_IN_PRODUCTION = true;
         expect(Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toBe('testKey4');
-        expect(Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toBe('a.b.c');
         CONFIG.default.IS_IN_PRODUCTION = ORIGINAL_IS_IN_PRODUCTION;
     });
 
@@ -53,7 +51,6 @@ describe('translate', () => {
         const expectedValue = 'With variable Test Variable';
         const testVariable = 'Test Variable';
         expect(Localize.translate(CONST.LOCALES.EN, 'testKeyGroup.testFunction', {testVariable})).toBe(expectedValue);
-        expect(Localize.translate(CONST.LOCALES.EN, ['testKeyGroup', 'testFunction'], {testVariable})).toBe(expectedValue);
     });
 });
 
@@ -97,3 +94,45 @@ describe('Translation Keys', () => {
         });
     });
 });
+
+describe('flattenObject', () => {
+    it('It should work correctly', () => {
+        const func = ({content}) => `This is the content: ${content}`;
+        const simpleObject = {
+            common: {
+                yes: 'Yes',
+                no: 'No',
+            },
+            complex: {
+                activity: {
+                    none: 'No Activity',
+                    some: 'Some Activity',
+                },
+                report: {
+                    title: {
+                        expense: 'Expense',
+                        task: 'Task',
+                    },
+                    description: {
+                        none: 'No description',
+                    },
+                    content: func,
+                    messages: ['Hello', 'Hi', 'Sup!'],
+                },
+            },
+        };
+
+        const result = translations.flattenObject(simpleObject);
+        expect(result).toStrictEqual({
+            'common.yes': 'Yes',
+            'common.no': 'No',
+            'complex.activity.none': 'No Activity',
+            'complex.activity.some': 'Some Activity',
+            'complex.report.title.expense': 'Expense',
+            'complex.report.title.task': 'Task',
+            'complex.report.description.none': 'No description',
+            'complex.report.content': func,
+            'complex.report.messages': ['Hello', 'Hi', 'Sup!'],
+        });
+    });
+});
diff --git a/tests/unit/markPullRequestsAsDeployedTest.js b/tests/unit/markPullRequestsAsDeployedTest.js
new file mode 100644
index 000000000000..e9e68236ef99
--- /dev/null
+++ b/tests/unit/markPullRequestsAsDeployedTest.js
@@ -0,0 +1,292 @@
+/**
+ * @jest-environment node
+ */
+const _ = require('underscore');
+const GitUtils = require('../../.github/libs/GitUtils');
+const GithubUtils = require('../../.github/libs/GithubUtils');
+
+let run;
+
+const mockGetInput = jest.fn();
+const mockGetPullRequest = jest.fn();
+const mockCreateComment = jest.fn();
+const mockListTags = jest.fn();
+const mockGetCommit = jest.fn();
+let workflowRunURL;
+const PRList = {
+    1: {
+        issue_number: 1,
+        title: 'Test PR 1',
+        merged_by: {
+            login: 'odin',
+        },
+    },
+    2: {
+        issue_number: 2,
+        title: 'Test PR 2',
+        merged_by: {
+            login: 'loki',
+        },
+    },
+};
+const version = '42.42.42-42';
+const defaultTags = [
+    {name: '42.42.42-42', commit: {sha: 'abcd'}},
+    {name: '42.42.42-41', commit: {sha: 'efgh'}},
+];
+
+/**
+ * @param {String} key
+ * @returns {Boolean|String}
+ * @throws {Error}
+ */
+function mockGetInputDefaultImplementation(key) {
+    switch (key) {
+        case 'PR_LIST':
+            return JSON.stringify(_.keys(PRList));
+        case 'IS_PRODUCTION_DEPLOY':
+            return false;
+        case 'DEPLOY_VERSION':
+            return version;
+        case 'IOS':
+        case 'ANDROID':
+        case 'DESKTOP':
+        case 'WEB':
+            return 'success';
+        default:
+            throw new Error('Trying to access invalid input');
+    }
+}
+
+/**
+ * @param {String} sha
+ * @returns {Promise<{data: {message: String}}>}
+ */
+async function mockGetCommitDefaultImplementation({commit_sha}) {
+    if (commit_sha === 'abcd') {
+        return {data: {message: 'Test commit 1'}};
+    }
+    return {data: {message: 'Test commit 2'}};
+}
+
+beforeAll(() => {
+    // Mock core module
+    jest.mock('@actions/core', () => ({
+        getInput: mockGetInput,
+    }));
+    mockGetInput.mockImplementation(mockGetInputDefaultImplementation);
+
+    // Mock octokit module
+    const moctokit = {
+        rest: {
+            issues: {
+                listForRepo: jest.fn().mockImplementation(async () => ({
+                    data: [
+                        {
+                            number: 5,
+                        },
+                    ],
+                })),
+                listEvents: jest.fn().mockImplementation(async () => ({
+                    data: [{event: 'closed', actor: {login: 'thor'}}],
+                })),
+                createComment: mockCreateComment,
+            },
+            pulls: {
+                get: mockGetPullRequest,
+            },
+            repos: {
+                listTags: mockListTags,
+            },
+            git: {
+                getCommit: mockGetCommit,
+            },
+        },
+        paginate: jest.fn().mockImplementation((objectMethod) => objectMethod().then(({data}) => data)),
+    };
+    GithubUtils.internalOctokit = moctokit;
+
+    // Mock GitUtils
+    GitUtils.getPullRequestsMergedBetween = jest.fn();
+
+    jest.mock('../../.github/libs/ActionUtils', () => ({
+        getJSONInput: jest.fn().mockImplementation((name, defaultValue) => {
+            try {
+                const input = mockGetInput(name);
+                return JSON.parse(input);
+            } catch (err) {
+                return defaultValue;
+            }
+        }),
+    }));
+
+    // Set GH runner environment variables
+    process.env.GITHUB_SERVER_URL = 'https://github.com';
+    process.env.GITHUB_REPOSITORY = 'Expensify/App';
+    process.env.GITHUB_RUN_ID = 1234;
+    workflowRunURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+});
+
+beforeEach(() => {
+    mockGetPullRequest.mockImplementation(async ({pull_number}) => (pull_number in PRList ? {data: PRList[pull_number]} : {}));
+    mockListTags.mockResolvedValue({
+        data: defaultTags,
+    });
+    mockGetCommit.mockImplementation(mockGetCommitDefaultImplementation);
+});
+
+afterEach(() => {
+    mockGetInput.mockClear();
+    mockCreateComment.mockClear();
+    mockGetPullRequest.mockClear();
+});
+
+afterAll(() => {
+    jest.clearAllMocks();
+});
+
+describe('markPullRequestsAsDeployed', () => {
+    it('comments on pull requests correctly for a standard staging deploy', async () => {
+        // Note: we import this in here so that it executes after all the mocks are set up
+        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        await run();
+        expect(mockCreateComment).toHaveBeenCalledTimes(_.keys(PRList).length);
+        for (let i = 0; i < _.keys(PRList).length; i++) {
+            const PR = PRList[i + 1];
+            expect(mockCreateComment).toHaveBeenNthCalledWith(i + 1, {
+                body: `🚀 [Deployed](${workflowRunURL}) to staging by https://github.com/${PR.merged_by.login} in version: ${version} 🚀
+
+platform | result
+---|---
+🤖 android 🤖|success ✅
+🖥 desktop 🖥|success ✅
+🍎 iOS 🍎|success ✅
+🕸 web 🕸|success ✅`,
+                issue_number: PR.issue_number,
+                owner: 'Expensify',
+                repo: 'App',
+            });
+        }
+    });
+
+    it('comments on pull requests correctly for a standard production deploy', async () => {
+        mockGetInput.mockImplementation((key) => {
+            if (key === 'IS_PRODUCTION_DEPLOY') {
+                return true;
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+
+        // Note: we import this in here so that it executes after all the mocks are set up
+        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+
+        await run();
+        expect(mockCreateComment).toHaveBeenCalledTimes(_.keys(PRList).length);
+        for (let i = 0; i < _.keys(PRList).length; i++) {
+            expect(mockCreateComment).toHaveBeenNthCalledWith(i + 1, {
+                body: `🚀 [Deployed](${workflowRunURL}) to production by https://github.com/thor in version: ${version} 🚀
+
+platform | result
+---|---
+🤖 android 🤖|success ✅
+🖥 desktop 🖥|success ✅
+🍎 iOS 🍎|success ✅
+🕸 web 🕸|success ✅`,
+                issue_number: PRList[i + 1].issue_number,
+                owner: 'Expensify',
+                repo: 'App',
+            });
+        }
+    });
+
+    it('comments on pull requests correctly for a cherry pick', async () => {
+        mockGetInput.mockImplementation((key) => {
+            if (key === 'PR_LIST') {
+                return JSON.stringify([3]);
+            }
+            if (key === 'DEPLOY_VERSION') {
+                return '42.42.42-43';
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+        mockGetPullRequest.mockImplementation(async ({pull_number}) => {
+            if (pull_number === 3) {
+                return {
+                    data: {
+                        issue_number: 3,
+                        title: 'Test PR 3',
+                        merged_by: {
+                            login: 'thor',
+                        },
+                    },
+                };
+            }
+            return {};
+        });
+        mockListTags.mockResolvedValue({
+            data: [{name: '42.42.42-43', commit: {sha: 'xyz'}}, ...defaultTags],
+        });
+        mockGetCommit.mockImplementation(async ({commit_sha}) => {
+            if (commit_sha === 'xyz') {
+                return {data: {message: 'Test PR 3 (cherry picked from commit dagdag)', committer: {name: 'freyja'}}};
+            }
+            return mockGetCommitDefaultImplementation(commit_sha);
+        });
+
+        // Note: we import this in here so that it executes after all the mocks are set up
+        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        await run();
+        expect(mockCreateComment).toHaveBeenCalledTimes(1);
+        expect(mockCreateComment).toHaveBeenCalledWith({
+            body: `🚀 [Cherry-picked](${workflowRunURL}) to staging by https://github.com/freyja in version: 42.42.42-43 🚀
+
+platform | result
+---|---
+🤖 android 🤖|success ✅
+🖥 desktop 🖥|success ✅
+🍎 iOS 🍎|success ✅
+🕸 web 🕸|success ✅
+
+@Expensify/applauseleads please QA this PR and check it off on the [deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) if it passes.`,
+            issue_number: 3,
+            owner: 'Expensify',
+            repo: 'App',
+        });
+    });
+
+    it('comments on pull requests correctly when one platform fails', async () => {
+        mockGetInput.mockImplementation((key) => {
+            if (key === 'ANDROID') {
+                return 'skipped';
+            }
+            if (key === 'IOS') {
+                return 'failed';
+            }
+            if (key === 'DESKTOP') {
+                return 'cancelled';
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+
+        // Note: we import this in here so that it executes after all the mocks are set up
+        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        await run();
+        expect(mockCreateComment).toHaveBeenCalledTimes(_.keys(PRList).length);
+        for (let i = 0; i < _.keys(PRList).length; i++) {
+            const PR = PRList[i + 1];
+            expect(mockCreateComment).toHaveBeenNthCalledWith(i + 1, {
+                body: `🚀 [Deployed](${workflowRunURL}) to staging by https://github.com/${PR.merged_by.login} in version: ${version} 🚀
+
+platform | result
+---|---
+🤖 android 🤖|skipped 🚫
+🖥 desktop 🖥|cancelled 🔪
+🍎 iOS 🍎|failed ❌
+🕸 web 🕸|success ✅`,
+                issue_number: PR.issue_number,
+                owner: 'Expensify',
+                repo: 'App',
+            });
+        }
+    });
+});
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index a8424d14ed33..05f40b465b68 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -25,7 +25,6 @@ function buildPersonalDetails(login, accountID, firstName = 'Test') {
         lastName: 'User',
         pronouns: '',
         timezone: CONST.DEFAULT_TIME_ZONE,
-        payPalMeAddress: '',
         phoneNumber: '',
     };
 }
diff --git a/web/proxy.js b/web/proxy.js
index 3bce08514600..0d82ae60b678 100644
--- a/web/proxy.js
+++ b/web/proxy.js
@@ -34,6 +34,7 @@ const server = http.createServer((request, response) => {
      * /staging/api?command=OpenReport => request sent to staging server
      * /staging-secure/api?command=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)) {
diff --git a/workflow_tests/README.md b/workflow_tests/README.md
new file mode 100644
index 000000000000..f5975a421120
--- /dev/null
+++ b/workflow_tests/README.md
@@ -0,0 +1,422 @@
+# Testing GitHub Actions workflows locally
+
+## Components
+The workflow testing framework consists mainly of 3 components:
+- [Jest](https://jestjs.io/) - testing framework, also used for [application tests](https://github.com/Expensify/App/tree/main/tests)
+- [Mock-github](https://github.com/kiegroup/mock-github) - package allowing for creation of local repositories, which can be used to make sure that the workflow tests have access only to these files that they should and that they won't modify the actual repository
+- [Act-js](https://github.com/kiegroup/act-js) - JS wrapper around [Act](https://github.com/nektos/act). Act is a tool that allows to run GitHub Actions workflows locally, and Act-js allows to configure and run Act from JS code, like Jest tests. It also provides additional tools like mocking workflow steps and retrieving the workflow output a JSON, which allows for comparison of the actual output with expected values
+
+## Setup
+- Install dependencies from `package.json` file with `npm install`
+- Make sure you have fulfilled the [prerequisites](https://github.com/nektos/act#necessary-prerequisites-for-running-act) for running `Act`
+- Install `Act` with `brew install act` and follow the documentation on [first Act run](https://github.com/nektos/act#first-act-run)
+- Set the environment variable `ACT_BINARY` to the path to your `Act` executable (`which act` if you're not sure what the path is)
+- You should be ready to run the tests now with `npm run workflow-test`
+- You can pre-generate new mocks/assertions/test files for a given workflow by running `npm run workflow-test:generate <workflow_file>`
+
+## Running
+- To run the workflow tests simply use
+  - `npm run workflow-test`
+  - this will run all the tests sequentially, which can take some time
+- To run a specific test suite you can use
+  - `npm run workflow-test -- -i <path_to_test_file>`
+  - this will run only the test from that specific test file
+- To run a specific test or subset of tests use
+  - `npm run workflow-test -- -t "<test_name_substring>"`
+  - this will run only the tests having `<test_name_substring>` in their name/description
+- You can combine these like `npm run workflow-test -- -i workflow_tests/preDeploy.test.js -t "single specific test"`
+- You can also use all other options which are normally usable with `jest`
+
+## Limitations
+Not all workflows can always be tested this way, for example:
+- Act and Act-js do not support all the runner types available in GitHub Actions, like `macOS` runners or some specific version of `Ubuntu` runners like `ubuntu-20.04-64core`. In these cases the job will be omitted entirely and cannot be tested
+- Testing more complex workflows in their entirety can be extremely time-consuming and cumbersome. It is often optimal to mock most of the steps with expressions printing the input and output conditions
+- Due to the way `Act` and `Act-js` handle workflow output, not much can be checked in the test. What is available, namely whether the job/step executed or not, whether it was successful or not and what its printed output was, should be enough in most scenarios
+- `Act` does not seem to support the conditions set on event parameters when determining whether to run the workflow or not, namely for a workflow defined with:
+```yaml
+on:
+  pull_request:
+    types: [opened, edited, reopened]
+```
+running `act pull_request -e event_data.json` with `event_data.json` having `{"action": "opened"}` will execute the workflow (as expected), running for example `act push` will not execute it (as expected), but running `act pull_request -e event_data.json` with `event_data.json` having for example `{"action": "assigned"}` **will still execute the workflow** even though it should only be executed with `action` being `opened`, `edited` or `reopened`. This only applies to running the workflow with `Act`, in the GitHub environment it still works as expected
+
+## File structure
+The testing framework file structure within the repository is as follows:
+- `App/` - main application folder
+  - `.github/` - GitHub Actions folder
+    - `workflows/` - workflows folder
+      - `<workflow_name>.yml` - workflow file
+      - `...` - other workflow files
+    - `...` - other GitHub Actions files
+  - `workflow_tests/` - workflow testing folder
+    - `jest.config.ts` - `Jest` configuration file
+    - `README.md` - this readme file
+    - `utils.js` - various utility functions used in multiple tests
+    - `<workflow_name>.test.js` - test suite file for a GitHub Actions workflow named `<workflow_name>`
+    - `mocks/` - folder with step mock definitions
+      - `<workflow_name>Mocks.js` - file with step mock definitions for the `../<workflow_name>.test.js` suite, or for the `<workflow_name>` workflow
+      - `...` - other step mock definition files
+    - `assertions/` - folder with output assertions
+      - `<workflow_name>Assertions.js` - file with output assertions for the `../<workflow_name>.test.js` suite, or for the `<workflow_name>` workflow
+      - `...` - other output assertion files
+    - `...` - other test suites
+  - `...` - other application files
+
+## Utility helpers
+`utils.js` file provides several helper methods to speed up the tests development and maintenance
+
+### `setUpActParams`
+`setUpActParams` allows for initiating the context in which Act will execute the workflow
+
+Parameters:
+- `act` - instance of previously created `Act` object that will be updated with new params
+- `event` - the name of the event, this can be any event name used by GitHub Actions, like `pull_request`, `push`, `workflow_dispatch`, etc.
+- `event_options` - object with options of the event, allowing for customising it for different scenarios, for example `push` event can be customised for pushing to different branches with options `{head: {ref: '<branch_name>'}}`
+- `secrets` - object with secret values provided, like `{<SECRET_NAME>: <secret_value>, ...}`
+- `github_token` - value of the GitHub token, analogous to providing `GITHUB_TOKEN` secret
+
+Returns an updated `Act` object instance
+
+Example:
+```javascript
+let act = new kieActJs.Act(repoPath, workflowPath);
+act = utils.setUpActParams(
+    act,
+    'push',
+    {head: {ref: 'main'}},
+    {OS_BOTIFY_TOKEN: 'dummy_token', GITHUB_ACTOR: 'Dummy Tester', SLACK_WEBHOOK: 'dummy_slack_webhook', LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_s3cr3t_p455word'},
+    'dummy_github_token',
+);
+```
+
+### `getMockStep`
+`getMockStep` allows for creating uniform mock step definitions compatible with `Act-js` and reduces time required, as well as possibility of errors/typos slipping in while developing tests. More complex behaviours have to be mocked manually
+
+Parameters:
+- `name` - name of the step that **must correspond to the `name` in the `<workflow>.yml` file**, otherwise the step cannot be found
+- `message` - the message to be printed to default output when mock gets executed
+- `job_id` - an optional id of the job that will be printed in `[]` square brackets along the `message`, useful when assessing the output with many steps from many jobs
+- `inputs` - a list of input parameters to be printed, useful when checking if the step had been executed with expected inputs
+- `in_envs` - a list of input environment variables, to be printed, useful when checking if the step had been executed in expected environment
+- `outputs` - an object with values which should be printed by the mock to `$GITHUB_OUTPUT`, useful for setting the step output
+- `out_envs` - an objects with values of environment variables set by the step in `$GITHUB_ENV`, useful for modifying the environment by the mock
+- `isSuccessful` - a boolean value indicating whether the step succeeds or not, exits with status `0` (if successful) or `1` (if not)
+
+Returns an object with step mock definition, ready to be provided to the `Act` object instance
+
+Example:
+```javascript
+let mockStep = utils.getMockStep(
+    'Name of the step from <workflow>.yml',
+    'Message to be printed',
+    'TEST_JOB',
+    ['INPUT_1', 'INPUT_2'],
+    ['ENV_1', 'ENV_2'],
+    {output_1: true, output_2: 'Some Result'},
+    {OUT_ENV: 'ENV_VALUE'},
+    false,      
+);
+```
+results in
+```javascript
+{
+    name: 'Name of the step from <workflow>.yml',
+    mockWith: 'echo [MOCK]'
+        + ' [TEST_JOB]'
+        + ' Message to be printed'
+        + ', INPUT_1="{{ inputs.INPUT_1 }}'
+        + ', INPUT_2="{{ inputs.INPUT_2 }}'
+        + ', ENV_1="{{ env.ENV_1 }}'
+        + ', ENV_1="{{ env.ENV_1 }}'
+        + '\necho "output_1=true" >> "$GITHUB_OUTPUT"',
+        + '\necho "output_2=Some Result" >> "$GITHUB_OUTPUT"',
+        + '\necho "OUT_ENV=ENV_VALUE" >> "$GITHUB_ENV"',
+        + '\nexit 1',
+}
+```
+
+### `getStepAssertion`
+`getStepAssertion` allows for creating uniform assertions for output from executed step, compatible with step mocks provided by `getMockStep`
+
+Parameters:
+- `name` - name of the step, **has to correspond to the name from `<workflow>.yml` file**, and the name in the step mock if applicable
+- `isSuccessful` - boolean value for checking if the step should have exited successfully
+- `expectedOutput` - an output that is expected from the step, compared directly - if provided the subsequent parameters are ignored
+- `jobId` - an optional expected job identifier
+- `message` - expected message printed by the step
+- `inputs` - expected input values provided to the step
+- `envs` - expected input environment variables for the step
+
+Returns an object with step expected output definition ready to be provided to `expect()` matcher
+
+Example:
+```javascript
+utils.getStepAssertion(
+    'Name of the step from <workflow>.yml',
+    false,
+    null,
+    'TEST_JOB',
+    'Message to be printed',
+    [{key: 'INPUT_1', value: true}, {key: 'INPUT_2', value: 'Some value'}],
+    [{key: 'PLAIN_ENV_VAR', value: 'Value'}, {key: 'SECRET_ENV_VAR', value: '***'}],
+)
+```
+results in
+```javascript
+{
+    name: 'Name of the step from <workflow>.yml',
+    status: 1,
+    output: '[MOCK]'
+        + ' [TEST_JOB]'
+        + ' Message to be printed'
+        + ', INPUT_1=true'
+        + ', INPUT_2=Some value'
+        + ', PLAIN_ENV_VAR=Value'
+        + ', SECRET_ENV_VAR=***',
+}
+```
+
+### `setJobRunners`
+`setJobRunners` overwrites the runner types for given jobs, helpful when the runner type in the workflow is not supported by `Act`
+
+Parameters:
+- `act` - instance of previously created `Act` object
+- `jobs` - object with keys being the IDs of the workflow jobs to be modified and values being the names of runners that should be used for them in the test
+- `workflowPath` - path to the workflow file to be updated, **NOTE**: this will modify the file, use the one from the local test repo, not from `App/.github/workflows`!
+
+Returns an `Act` object instance
+
+Let's say you have a workflow with a job using `macos-12` runner, which is unsupported by `Act` - in this case that job will simply be skipped altogether, not allowing you to test it in any way.
+```yaml
+iOS:
+  name: Build and deploy iOS
+  needs: validateActor
+  if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+  runs-on: macos-12
+  steps:
+```
+You can use this method to change the runner to something that is supported, like
+```javascript
+act = utils.setJobRunners(
+    act,
+    {
+        iOS: 'ubuntu-latest',
+    },
+    workflowPath,
+);
+```
+Now the test workflow will look as follows, which will allow you to run the job and do at least limited testing
+```yaml
+iOS:
+  name: Build and deploy iOS
+  needs: validateActor
+  if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+  runs-on: ubuntu-latest
+  steps:
+```
+
+## Typical test file
+The following is the typical test file content, which will be followed by a detailed breakdown
+```javascript
+const path = require('path');
+const kieActJs = require('@kie/act-js');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils');
+const assertions = require('./assertions/<workflow>Assertions');
+const mocks = require('./mocks/<workflow>Mocks');
+
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '<workflow>.yml'),
+        dest: '.github/workflows/<workflow>.yml',
+    },
+];
+
+beforeEach(async () => {
+    mockGithub = new kieMockGithub.MockGithub({
+        repo: {
+            testWorkflowsRepo: {
+                files: FILES_TO_COPY_INTO_TEST_REPO,
+            },
+        },
+    });
+
+    await mockGithub.setup();
+});
+
+afterEach(async () => {
+    await mockGithub.teardown();
+});
+
+describe('test some general behaviour', () => {
+    test('something happens - test if expected happened next', async () => {
+        // get path to the local test repo
+        const repoPath = mockGithub.repo.getPath('testWorkflowsRepo') || '';
+
+        // get path to the workflow file under test
+        const workflowPath = path.join(repoPath, '.github', 'workflows', '<workflow>.yml');
+
+        // instantiate Act in the context of the test repo and given workflow file
+        let act = new kieActJs.Act(repoPath, workflowPath);
+
+        // set run parameters
+        act = utils.setUpActParams(
+            act,
+            '<event>',
+            {head: {ref: '<branch_name>'}},
+            {'<SECRET_NAME>': '<secret_value'},
+            '<github_token>',
+        );
+
+        // set up mocks
+        const testMockSteps = {
+            '<job_1_name>': [
+                {
+                    name: '<step_1_1_name>',
+                    mockWith: '<mock_command>',
+                },
+                {
+                    name: '<step_1_2_name>',
+                    mockWith: '<mock_command>',
+                },
+            ],
+            '<job_2_name>': [
+                utils.getMockStep('<step_2_1_name>', '<message>'),
+                utils.getMockStep('<step_2_2_name>', '<message>'),
+            ],
+        };
+
+        // run an event and get the result
+        const result = await act
+            .runEvent('<event>', {
+                workflowFile: path.join(repoPath, '.github', 'workflows'),
+                mockSteps: testMockSteps,
+            });
+
+        // assert results (some steps can run in parallel to each other so the order is not assured
+        // therefore we can check which steps have been executed, but not the set job order
+        assertions.assertSomethingHappened(result);
+        assertions.assertSomethingDidNotHappen(result, false);
+    }, timeout);
+);
+```
+
+### Breakdown
+Define which files should be copied into the test repo. In this case we copy `actions`, `libs`, `scripts` folders in their entirety and just the one workflow file we want to test
+```javascript
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '<workflow>.yml'),
+        dest: '.github/workflows/<workflow>.yml',
+    },
+];
+```
+`beforeEach` gets executed before each test. Here we create the local test repository with the files defined in the `FILES_TO_COPY_INTO_TEST_REPO` variable. `testWorkflowRepo` is the name of the test repo and can be changed to whichever name you choose, just remember to use it later when accessing this repo. _Note that we can't use `beforeAll()` method, because while mocking steps `Act-js` modifies the workflow file copied into the test repo and thus mocking could persist between tests_
+```javascript
+beforeEach(async () => {
+    mockGithub = new kieMockGithub.MockGithub({
+        repo: {
+            testWorkflowsRepo: {
+                files: FILES_TO_COPY_INTO_TEST_REPO,
+            },
+        },
+    });
+
+    await mockGithub.setup();
+});
+```
+Similarly, `afterEach` gets executed after each test. In this case we remove the test repo after the test finishes
+```javascript
+afterEach(async () => {
+    await mockGithub.teardown();
+});
+```
+Get path to the local test repo, useful to have it in a variable
+```javascript
+const repoPath = mockGithub.repo.getPath('testWorkflowsRepo') || '';
+```
+Get path to the workflow under test. Note that it's the path **in the test repo**
+```javascript
+const workflowPath = path.join(repoPath, '.github', 'workflows', '<workflow>.yml');
+```
+Instantiate `Act` object instance. Here we provide the constructor with the path to the test repo (so that `Act` can execute in its context) and the path the workflow file under test (so just the workflow we want to test would be executed)
+```javascript
+let act = new kieActJs.Act(repoPath, workflowPath);
+```
+Set up initial parameters for `Act`. This is where we can set secrets, GitHub token and options for the events (like the name of the branch to which the push has been made, etc.)
+```javascript
+act = utils.setUpActParams(
+    act,
+    '<event>',
+    {head: {ref: '<branch_name>'}},
+    {'<SECRET_NAME>': '<secret_value'},
+    '<github_token>',
+);
+```
+Set up step mocks. Here we configure which steps in the workflow should be mocked, and with what behaviour. This takes form of an object with keys corresponding to the names of the jobs in the workflow, and values being mock definitions for specific steps. The steps can be identified either by `id`, `name`, `uses` or `run`. Step mock can be defined either by hand (`<job_1_name>`) or with the helper method `utils.getMockStep()` (`<job_2_name>`). Not mocked steps will be executed normally - **make sure this will not have unexpected consequences**
+```javascript
+const testMockSteps = {
+    '<job_1_name>': [
+        {
+            name: '<step_1_1_name>',
+            mockWith: '<mock_command>',
+        },
+        {
+            name: '<step_1_2_name>',
+            mockWith: '<mock_command>',
+        },
+    ],
+    '<job_2_name>': [
+        utils.getMockStep('<step_2_1_name>', '<message>'),
+        utils.getMockStep('<step_2_2_name>', '<message>'),
+    ],
+};
+```
+Most important part - actually running the event with `Act`. This executes the specified `<event>` in the context of the local test repo created before and with the workflow under test set up. `result` stores the output of `Act` execution, which can then be compared to what was expected. Note that the `workflowFile` is actually path to _workflow folder_ and not the file itself - `Act-js` determines the name of the workflow by itself, and tries to find it in the specified `workflowFile` path, so _providing the full path to the file will fail_
+```javascript
+const result = await act
+    .runEvent('<event>', {
+        workflowFile: path.join(repoPath, '.github', 'workflows'),
+        mockSteps: testMockSteps,
+    });
+```
+Assert results are as expected. This can, for example, include using `expect()` to check if the steps that should be executed have indeed been executed, steps that shouldn't run have not been executed, compare statuses (which steps succeeded, which failed) and step outputs. Outputs can include additional information, like input values, environmental variables, secrets (although these are usually not accessible and represented by `***`, this can still be useful to check if the value exists or not). Here it's usually done with the helper assertion methods defined in the assertions file. Step assertions can be created manually or with `getStepAssertion()` helper method
+```javascript
+assertions.assertSomethingHappened(result);
+assertions.assertSomethingDidNotHappen(result, false);
+```
+
+## FAQ
+### I'm positive that one of the jobs should run, but it doesn't - why?
+#### Check the runner type (`runs-on`) it may not be set (which `Act` does not like) or it may be set to one of the unsupported types (primarily the `macos-...` runner types). You can always overwrite the runner type with `utils.setJobRunners()` helper method
+### My workflow has many jobs, each with many steps, how do I start testing it without spending hours on setup?
+#### First of all, consider splitting the workflow into several smaller pieces, with the main one acting as coordinator and calling the others. Secondly, you can bootstrap the test with `npm run workflow-test:generate <workflow>.yml`, which will generate mocks and assertions for you, as well as the stub of the test file
+### After using `workflow-test:generate` the files are incomplete, or they have errors. Why?
+#### Make sure that the workflow file you want to test, has all steps with names, as the bootstrapping script uses step names to locate and mock them - same with assertions. After you've added the `name` properties to steps, remove the previously generated files and run the command again
+### I want to just run the test that I am working on, without all the others - how can I do it?
+#### You can pass parameters to the `npm run workflow-test` command as you would with `jest` or `npm test` - `npm run workflow-test -- -i <path/to/testfile>` will run just the tests within `testfile`. You can also filter further with `-t <part_of_test_name>`
diff --git a/workflow_tests/assertions/authorChecklistAssertions.js b/workflow_tests/assertions/authorChecklistAssertions.js
new file mode 100644
index 000000000000..c57fe922c754
--- /dev/null
+++ b/workflow_tests/assertions/authorChecklistAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('authorChecklist.js', true, null, 'CHECKLIST', 'Running authorChecklist.js', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertChecklistJobExecuted,
+};
diff --git a/workflow_tests/assertions/cherryPickAssertions.js b/workflow_tests/assertions/cherryPickAssertions.js
new file mode 100644
index 000000000000..42ecc3d64262
--- /dev/null
+++ b/workflow_tests/assertions/cherryPickAssertions.js
@@ -0,0 +1,119 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Check if user is deployer', true, null, 'VALIDATEACTOR', 'Checking if user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATENEWVERSION', 'Creating new version', [], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCherryPickJobExecuted = (workflowResult, user = 'Dummy Author', pullRequestNumber = '1234', didExecute = true, hasConflicts = false, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout staging branch',
+            true,
+            null,
+            'CHERRYPICK',
+            'Checking out staging branch',
+            [
+                {key: 'ref', value: 'staging'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Set up git for OSBotify', true, null, 'CHERRYPICK', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Get previous app version', true, null, 'CHERRYPICK', 'Get previous app version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}]),
+        utils.createStepAssertion('Fetch history of relevant refs', true, null, 'CHERRYPICK', 'Fetch history of relevant refs'),
+        utils.createStepAssertion('Get version bump commit', true, null, 'CHERRYPICK', 'Get version bump commit', [], []),
+        utils.createStepAssertion(
+            'Get merge commit for pull request to CP',
+            true,
+            null,
+            'CHERRYPICK',
+            'Get merge commit for pull request to CP',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'USER', value: user},
+                {key: 'PULL_REQUEST_NUMBER', value: pullRequestNumber},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Cherry-pick the version-bump to staging', true, null, 'CHERRYPICK', 'Cherry-picking the version-bump to staging', [], []),
+        utils.createStepAssertion('Cherry-pick the merge commit of target PR', true, null, 'CHERRYPICK', 'Cherry-picking the merge commit of target PR', [], []),
+        utils.createStepAssertion('Push changes', true, null, 'CHERRYPICK', 'Pushing changes', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const conflictSteps = [
+        utils.createStepAssertion(
+            'Create Pull Request to manually finish CP',
+            true,
+            null,
+            'CHERRYPICK',
+            'Creating Pull Request to manually finish CP',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    conflictSteps.forEach((step) => {
+        if (didExecute && hasConflicts) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion(
+            'Announces a CP failure in the #announce Slack room',
+            true,
+            null,
+            'CHERRYPICK',
+            'Announcing a CP failure',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertCreateNewVersionJobExecuted,
+    assertCherryPickJobExecuted,
+};
diff --git a/workflow_tests/assertions/claAssertions.js b/workflow_tests/assertions/claAssertions.js
new file mode 100644
index 000000000000..b85eb263d838
--- /dev/null
+++ b/workflow_tests/assertions/claAssertions.js
@@ -0,0 +1,73 @@
+const utils = require('../utils/utils');
+
+const assertCLAJobExecuted = (workflowResult, commentBody = '', githubRepository = '', didExecute = true, runAssistant = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'CLA comment check',
+            true,
+            null,
+            'CLA',
+            'CLA comment check',
+            [
+                {key: 'text', value: commentBody},
+                {key: 'regex', value: '\\s*I have read the CLA Document and I hereby sign the CLA\\s*'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'CLA comment re-check',
+            true,
+            null,
+            'CLA',
+            'CLA comment re-check',
+            [
+                {key: 'text', value: commentBody},
+                {key: 'regex', value: '\\s*recheck\\s*'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const assistantSteps = [
+        utils.createStepAssertion(
+            'CLA Assistant',
+            true,
+            null,
+            'CLA',
+            'CLA Assistant',
+            [
+                {key: 'path-to-signatures', value: `${githubRepository}/cla.json`},
+                {key: 'path-to-document', value: `https://github.com/${githubRepository}/blob/main/contributingGuides/CLA.md`},
+                {key: 'branch', value: 'main'},
+                {key: 'remote-organization-name', value: 'Expensify'},
+                {key: 'remote-repository-name', value: 'CLA'},
+                {key: 'lock-pullrequest-aftermerge', value: false},
+                {key: 'allowlist', value: 'OSBotify,snyk-bot'},
+            ],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'PERSONAL_ACCESS_TOKEN', value: '***'},
+            ],
+        ),
+    ];
+
+    assistantSteps.forEach((step) => {
+        if (didExecute && runAssistant) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertCLAJobExecuted,
+};
diff --git a/workflow_tests/assertions/createNewVersionAssertions.js b/workflow_tests/assertions/createNewVersionAssertions.js
new file mode 100644
index 000000000000..e4526ae59be2
--- /dev/null
+++ b/workflow_tests/assertions/createNewVersionAssertions.js
@@ -0,0 +1,72 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Get user permissions', true, null, 'VALIDATEACTOR', 'Get user permissions', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertCreateNewVersionJobExecuted = (workflowResult, semverLevel = 'BUILD', didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Run turnstyle', true, null, 'CREATENEWVERSION', 'Run turnstyle', [{key: 'poll-interval-seconds', value: '10'}], [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion(
+            'Check out',
+            true,
+            null,
+            'CREATENEWVERSION',
+            'Check out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'CREATENEWVERSION', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion(
+            'Generate version',
+            true,
+            null,
+            'CREATENEWVERSION',
+            'Generate version',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SEMVER_LEVEL', value: semverLevel},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Commit new version', true, null, 'CREATENEWVERSION', 'Commit new version', [], []),
+        utils.createStepAssertion('Update main branch', true, null, 'CREATENEWVERSION', 'Update main branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            if (isSuccessful) {
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CREATENEWVERSION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertCreateNewVersionJobExecuted,
+};
diff --git a/workflow_tests/assertions/deployAssertions.js b/workflow_tests/assertions/deployAssertions.js
new file mode 100644
index 000000000000..bff99298bde5
--- /dev/null
+++ b/workflow_tests/assertions/deployAssertions.js
@@ -0,0 +1,63 @@
+const utils = require('../utils/utils');
+
+const assertDeployStagingJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout staging branch', true, null, 'DEPLOY_STAGING', 'Checking out staging branch', [
+            {key: 'ref', value: 'staging'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_STAGING', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Tag version', true, null, 'DEPLOY_STAGING', 'Tagging new version'),
+        utils.createStepAssertion('🚀 Push tags to trigger staging deploy 🚀', true, null, 'DEPLOY_STAGING', 'Pushing tag to trigger staging deploy'),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDeployProductionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOY_PRODUCTION', 'Checking out', [
+            {key: 'ref', value: 'production'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_PRODUCTION', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Get current app version', true, null, 'DEPLOY_PRODUCTION', 'Getting current app version'),
+        utils.createStepAssertion('Get Release Pull Request List', true, null, 'DEPLOY_PRODUCTION', 'Getting release PR list', [
+            {key: 'TAG', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: 'true'},
+        ]),
+        utils.createStepAssertion('Generate Release Body', true, null, 'DEPLOY_PRODUCTION', 'Generating release body', [{key: 'PR_LIST', value: '[1.2.1, 1.2.2]'}]),
+        utils.createStepAssertion(
+            '🚀 Create release to trigger production deploy 🚀',
+            true,
+            null,
+            'DEPLOY_PRODUCTION',
+            'Creating release to trigger production deploy',
+            [
+                {key: 'tag_name', value: '1.2.3'},
+                {key: 'body', value: 'Release body'},
+            ],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertDeployStagingJobExecuted,
+    assertDeployProductionJobExecuted,
+};
diff --git a/workflow_tests/assertions/deployBlockerAssertions.js b/workflow_tests/assertions/deployBlockerAssertions.js
new file mode 100644
index 000000000000..8d2d6039960e
--- /dev/null
+++ b/workflow_tests/assertions/deployBlockerAssertions.js
@@ -0,0 +1,98 @@
+const utils = require('../utils/utils');
+
+const assertDeployBlockerJobExecuted = (workflowResult, issueTitle, issueNumber, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOYBLOCKER', 'Checkout', [{key: 'token', value: '***'}], []),
+        utils.createStepAssertion(
+            'Get URL, title, & number of new deploy blocker (issue)',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Get URL, title and number of new deploy blocker - issue',
+            [],
+            [{key: 'TITLE', value: issueTitle}],
+        ),
+        utils.createStepAssertion(
+            'Update StagingDeployCash with new deploy blocker',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Update StagingDeployCash with new deploy blocker',
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Give the issue/PR the Hourly, Engineering labels',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Give the issue/PR the Hourly, Engineering labels',
+            [
+                {key: 'add-labels', value: 'Hourly, Engineering'},
+                {key: 'remove-labels', value: 'Daily, Weekly, Monthly'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Comment on deferred PR',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Comment on deferred PR',
+            [
+                {key: 'github_token', value: '***'},
+                {key: 'number', value: issueNumber},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            if (isSuccessful) {
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const successSteps = [
+        utils.createStepAssertion(
+            'Post the issue in the #expensify-open-source slack room',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Post the issue in the expensify-open-source slack room',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    successSteps.forEach((step) => {
+        if (didExecute && isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'DEPLOYBLOCKER', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertDeployBlockerJobExecuted,
+};
diff --git a/workflow_tests/assertions/finishReleaseCycleAssertions.js b/workflow_tests/assertions/finishReleaseCycleAssertions.js
new file mode 100644
index 000000000000..12a8b9f2b05d
--- /dev/null
+++ b/workflow_tests/assertions/finishReleaseCycleAssertions.js
@@ -0,0 +1,186 @@
+const utils = require('../utils/utils');
+
+const assertValidateJobExecuted = (workflowResult, issueNumber = '', didExecute = true, isTeamMember = true, hasBlockers = false, isSuccessful = true) => {
+    const steps = [utils.createStepAssertion('Validate actor is deployer', true, null, 'VALIDATE', 'Validating if actor is deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+    if (isTeamMember) {
+        steps.push(
+            utils.createStepAssertion(
+                'Check for any deploy blockers',
+                true,
+                null,
+                'VALIDATE',
+                'Checking for deploy blockers',
+                [
+                    {key: 'GITHUB_TOKEN', value: '***'},
+                    {key: 'ISSUE_NUMBER', value: issueNumber},
+                ],
+                [],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const notTeamMemberSteps = [
+        utils.createStepAssertion(
+            'Reopen and comment on issue (not a team member)',
+            true,
+            null,
+            'VALIDATE',
+            'Reopening issue - not a team member',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ISSUE_NUMBER', value: issueNumber},
+                {key: 'COMMENT', value: 'Sorry, only members of @Expensify/Mobile-Deployers can close deploy checklists.\nReopening!'},
+            ],
+            [],
+        ),
+    ];
+
+    notTeamMemberSteps.forEach((expectedStep) => {
+        if (didExecute && !isTeamMember) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const blockerSteps = [
+        utils.createStepAssertion(
+            'Reopen and comment on issue (has blockers)',
+            true,
+            null,
+            'VALIDATE',
+            'Reopening issue - blockers',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ISSUE_NUMBER', value: issueNumber},
+            ],
+            [],
+        ),
+    ];
+
+    blockerSteps.forEach((expectedStep) => {
+        if (didExecute && hasBlockers) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'VALIDATE', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateProductionJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'UPDATEPRODUCTION',
+            'Checkout',
+            [
+                {key: 'ref', value: 'staging'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATEPRODUCTION', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Update production branch', true, null, 'UPDATEPRODUCTION', 'Updating production branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATEPRODUCTION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewPatchVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATENEWPATCHVERSION', 'Creating new version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'UPDATESTAGING',
+            'Checkout',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATESTAGING', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Update staging branch to trigger staging deploy', true, null, 'UPDATESTAGING', 'Updating staging branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATESTAGING', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateJobExecuted,
+    assertUpdateProductionJobExecuted,
+    assertCreateNewPatchVersionJobExecuted,
+    assertUpdateStagingJobExecuted,
+};
diff --git a/workflow_tests/assertions/lintAssertions.js b/workflow_tests/assertions/lintAssertions.js
new file mode 100644
index 000000000000..938f9b383464
--- /dev/null
+++ b/workflow_tests/assertions/lintAssertions.js
@@ -0,0 +1,22 @@
+const utils = require('../utils/utils');
+
+const assertLintJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'LINT', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'LINT', 'Setup Node', [], []),
+        utils.createStepAssertion('Lint JavaScript and Typescript with ESLint', true, null, 'LINT', 'Lint JavaScript with ESLint', [], [{key: 'CI', value: 'true'}]),
+        utils.createStepAssertion('Lint shell scripts with ShellCheck', true, null, 'LINT', 'Lint shell scripts with ShellCheck', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertLintJobExecuted,
+};
diff --git a/workflow_tests/assertions/lockDeploysAssertions.js b/workflow_tests/assertions/lockDeploysAssertions.js
new file mode 100644
index 000000000000..874076dc3a28
--- /dev/null
+++ b/workflow_tests/assertions/lockDeploysAssertions.js
@@ -0,0 +1,84 @@
+const utils = require('../utils/utils');
+
+const assertlockStagingDeploysJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Checking out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Wait for staging deploys to finish', true, null, 'LOCKSTAGINGDEPLOYS', 'Waiting for staging deploys to finish', [{key: 'GITHUB_TOKEN', value: '***'}], []),
+        utils.createStepAssertion(
+            'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Commenting in StagingDeployCash',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertlockStagingDeploysJobFailedAfterFirstStep = (workflowResult) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Checking out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Wait for staging deploys to finish',
+            false,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Waiting for staging deploys to finish',
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+            [],
+        ),
+        utils.createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+    });
+};
+
+module.exports = {
+    assertlockStagingDeploysJobExecuted,
+    assertlockStagingDeploysJobFailedAfterFirstStep,
+};
diff --git a/workflow_tests/assertions/platformDeployAssertions.js b/workflow_tests/assertions/platformDeployAssertions.js
new file mode 100644
index 000000000000..35242cd24d31
--- /dev/null
+++ b/workflow_tests/assertions/platformDeployAssertions.js
@@ -0,0 +1,371 @@
+const utils = require('../utils/utils');
+
+const assertVerifyActorJobExecuted = (workflowResult, username, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Check if user is deployer', true, null, 'VALIDATE_ACTOR', 'Checking if the user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDeployChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOY_CHECKLIST', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'DEPLOY_CHECKLIST', 'Setup Node'),
+        utils.createStepAssertion('Set version', true, null, 'DEPLOY_CHECKLIST', 'Set version'),
+        utils.createStepAssertion('Create or update staging deploy', true, null, 'DEPLOY_CHECKLIST', 'Create or update staging deploy', [
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'NPM_VERSION', value: '1.2.3'},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertAndroidJobExecuted = (workflowResult, didExecute = true, isProduction = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'ANDROID', 'Checking out'),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setting up Node'),
+        utils.createStepAssertion('Setup Ruby', true, null, 'ANDROID', 'Setting up Ruby', [
+            {key: 'ruby-version', value: '2.7'},
+            {key: 'bundler-cache', value: 'true'},
+        ]),
+        utils.createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypting keystore', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypting JSON key', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Set version in ENV', true, null, 'ANDROID', 'Setting version in ENV'),
+    ];
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Run Fastlane beta', true, null, 'ANDROID', 'Running Fastlane beta', null, [
+                {key: 'MYAPP_UPLOAD_STORE_PASSWORD', value: '***'},
+                {key: 'MYAPP_UPLOAD_KEY_PASSWORD', value: '***'},
+            ]),
+        );
+    } else {
+        steps.push(utils.createStepAssertion('Run Fastlane production', true, null, 'ANDROID', 'Running Fastlane production', null, [{key: 'VERSION', value: '1.2.3'}]));
+    }
+    steps.push(
+        utils.createStepAssertion('Archive Android sourcemaps', true, null, 'ANDROID', 'Archiving Android sourcemaps', [
+            {key: 'name', value: 'android-sourcemap'},
+            {key: 'path', value: 'android/app/build/generated/sourcemaps/react/release/*.map'},
+        ]),
+    );
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Upload Android version to Browser Stack', true, null, 'ANDROID', 'Uploading Android version to Browser Stack', null, [
+                {key: 'BROWSERSTACK', value: '***'},
+            ]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion(
+            'Warn deployers if Android production deploy failed',
+            true,
+            null,
+            'ANDROID',
+            'Warning deployers of failed production deploy',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && isProduction && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDesktopJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setting up Node'),
+        utils.createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypting developer id certificate', null, [
+            {key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'},
+        ]),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion('Build production desktop app', true, null, 'DESKTOP', 'Building production desktop app', null, [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ]),
+        );
+    } else {
+        steps.push(
+            utils.createStepAssertion('Build staging desktop app', true, null, 'DESKTOP', 'Building staging desktop app', null, [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertIOSJobExecuted = (workflowResult, didExecute = true, isProduction = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'IOS', 'Checking out'),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Setup Node', true, null, 'IOS', 'Setting up Node'),
+        utils.createStepAssertion('Setup Ruby', true, null, 'IOS', 'Setting up Ruby', [
+            {key: 'ruby-version', value: '2.7'},
+            {key: 'bundler-cache', value: 'true'},
+        ]),
+        utils.createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [
+            {key: 'path', value: 'ios/Pods'},
+            {key: 'key', value: 'Linux-pods-cache-'},
+            {key: 'restore-keys', value: 'Linux-pods-cache-'},
+        ]),
+        utils.createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
+        utils.createStepAssertion('Install cocoapods', true, null, 'IOS', 'Installing cocoapods', [
+            {key: 'timeout_minutes', value: '10'},
+            {key: 'max_attempts', value: '5'},
+            {key: 'command', value: 'cd ios && bundle exec pod install'},
+        ]),
+        utils.createStepAssertion('Decrypt profile', true, null, 'IOS', 'Decrypting profile', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypting certificate', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt App Store Connect API key', true, null, 'IOS', 'Decrypting App Store API key', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+    ];
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Run Fastlane', true, null, 'IOS', 'Running Fastlane', null, [
+                {key: 'APPLE_CONTACT_EMAIL', value: '***'},
+                {key: 'APPLE_CONTACT_PHONE', value: '***'},
+                {key: 'APPLE_DEMO_EMAIL', value: '***'},
+                {key: 'APPLE_DEMO_PASSWORD', value: '***'},
+            ]),
+        );
+    }
+    steps.push(
+        utils.createStepAssertion('Archive iOS sourcemaps', true, null, 'IOS', 'Archiving sourcemaps', [
+            {key: 'name', value: 'ios-sourcemap'},
+            {key: 'path', value: 'main.jsbundle.map'},
+        ]),
+    );
+    if (!isProduction) {
+        steps.push(utils.createStepAssertion('Upload iOS version to Browser Stack', true, null, 'IOS', 'Uploading version to Browser Stack', null, [{key: 'BROWSERSTACK', value: '***'}]));
+    } else {
+        steps.push(
+            utils.createStepAssertion('Set iOS version in ENV', true, null, 'IOS', 'Setting iOS version'),
+            utils.createStepAssertion('Run Fastlane for App Store release', true, null, 'IOS', 'Running Fastlane for release', null, [{key: 'VERSION', value: '1.2.3'}]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion(
+            'Warn deployers if iOS production deploy failed',
+            true,
+            null,
+            'IOS',
+            'Warning developers of failed deploy',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && isProduction && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertWebJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'WEB', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'WEB', 'Setting up Node'),
+        utils.createStepAssertion('Setup Cloudflare CLI', true, null, 'WEB', 'Setting up Cloudflare CLI'),
+        utils.createStepAssertion('Configure AWS Credentials', true, null, 'WEB', 'Configuring AWS credentials', [
+            {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+            {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+        ]),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion('Build web for production', true, null, 'WEB', 'Building web for production'),
+            utils.createStepAssertion('Build storybook docs for production', true, null, 'WEB', 'Build storybook docs for production'),
+            utils.createStepAssertion('Deploy production to S3', true, null, 'WEB', 'Deploying production to S3'),
+            utils.createStepAssertion('Purge production Cloudflare cache', true, null, 'WEB', 'Purging production Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
+        );
+    } else {
+        steps.push(
+            utils.createStepAssertion('Build web for staging', true, null, 'WEB', 'Building web for staging'),
+            utils.createStepAssertion('Build storybook docs for staging', true, null, 'WEB', 'Build storybook docs for staging'),
+            utils.createStepAssertion('Deploy staging to S3', true, null, 'WEB', 'Deploying staging to S3'),
+            utils.createStepAssertion('Purge staging Cloudflare cache', true, null, 'WEB', 'Purging staging Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostSlackOnFailureJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Post Slack message on failure', true, null, 'POST_SLACK_FAIL', 'Posting Slack message on platform deploy failure', [{key: 'SLACK_WEBHOOK', value: '***'}]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostSlackOnSuccessJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POST_SLACK_SUCCESS', 'Checking out'),
+        utils.createStepAssertion('Set version', true, null, 'POST_SLACK_SUCCESS', 'Setting version'),
+        utils.createStepAssertion(
+            'Announces the deploy in the #announce Slack room',
+            true,
+            null,
+            'POST_SLACK_SUCCESS',
+            'Posting message to #announce channel',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Announces the deploy in the #deployer Slack room',
+            true,
+            null,
+            'POST_SLACK_SUCCESS',
+            'Posting message to #deployer channel',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion(
+                'Announces the deploy in the #expensify-open-source Slack room',
+                true,
+                null,
+                'POST_SLACK_SUCCESS',
+                'Posting message to #expensify-open-source channel',
+                [{key: 'status', value: 'custom'}],
+                [
+                    {key: 'GITHUB_TOKEN', value: '***'},
+                    {key: 'SLACK_WEBHOOK_URL', value: '***'},
+                ],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostGithubCommentJobExecuted = (workflowResult, didExecute = true, isProduction = true, didDeploy = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POST_GITHUB_COMMENT', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'POST_GITHUB_COMMENT', 'Setting up Node'),
+        utils.createStepAssertion('Set version', true, null, 'POST_GITHUB_COMMENT', 'Setting version'),
+        utils.createStepAssertion('Get Release Pull Request List', true, null, 'POST_GITHUB_COMMENT', 'Getting release pull request list', [
+            {key: 'TAG', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: isProduction ? 'true' : 'false'},
+        ]),
+        utils.createStepAssertion('Comment on issues', true, null, 'POST_GITHUB_COMMENT', 'Commenting on issues', [
+            {key: 'PR_LIST', value: '[1.2.1, 1.2.2]'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: isProduction ? 'true' : 'false'},
+            {key: 'DEPLOY_VERSION', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'ANDROID', value: didDeploy ? 'success' : ''},
+            {key: 'DESKTOP', value: didDeploy ? 'success' : ''},
+            {key: 'IOS', value: didDeploy ? 'success' : ''},
+            {key: 'WEB', value: didDeploy ? 'success' : ''},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyActorJobExecuted,
+    assertDeployChecklistJobExecuted,
+    assertAndroidJobExecuted,
+    assertDesktopJobExecuted,
+    assertIOSJobExecuted,
+    assertWebJobExecuted,
+    assertPostSlackOnFailureJobExecuted,
+    assertPostSlackOnSuccessJobExecuted,
+    assertPostGithubCommentJobExecuted,
+};
diff --git a/workflow_tests/assertions/preDeployAssertions.js b/workflow_tests/assertions/preDeployAssertions.js
new file mode 100644
index 000000000000..90d6f9febb75
--- /dev/null
+++ b/workflow_tests/assertions/preDeployAssertions.js
@@ -0,0 +1,219 @@
+const utils = require('../utils/utils');
+
+const assertTypecheckJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run typecheck workflow', true, null, 'TYPECHECK', 'Running typecheck workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertLintJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run lint workflow', true, null, 'LINT', 'Running lint workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertTestJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run test workflow', true, null, 'TEST', 'Running test workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertIsExpensifyEmployeeJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Get merged pull request', true, null, 'IS_EXPENSIFY_EMPLOYEE', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion(
+            'Check whether the PR author is member of Expensify/expensify team',
+            true,
+            null,
+            'IS_EXPENSIFY_EMPLOYEE',
+            'Checking actors Expensify membership',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertNewContributorWelcomeMessageJobExecuted = (workflowResult, didExecute = true, isOsBotify = false, isFirstPr = false) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Checking out', [{key: 'token', value: '***'}]),
+        utils.createStepAssertion('Get merged pull request', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion(isOsBotify ? 'Get PR count for OSBotify' : 'Get PR count for Dummy Author', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Getting PR count', [
+            {key: 'GITHUB_TOKEN', value: '***'},
+        ]),
+    ];
+    const osBotifyBody =
+        '@OSBotify, Great job getting your first Expensify/App pull request over the finish line! ' +
+        ":tada:\n\nI know there's a lot of information in our " +
+        '[contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), ' +
+        'so here are some points to take note of :memo::\n\n1. Now that your first PR has been merged, you can be ' +
+        "hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one " +
+        'job at a time.\n2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) ' +
+        "testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for " +
+        'fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without ' +
+        'causing a regression.\n3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. ' +
+        'After it has been on production for 7 days without causing any regressions, then we pay out the Upwork job. ' +
+        ":moneybag:\n\nSo it might take a while before you're paid for your work, but we typically post multiple " +
+        "new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience " +
+        'contributing to this repo! :blush:';
+    const userBody =
+        '@Dummy Author, Great job getting your first Expensify/App pull request over the finish ' +
+        "line! :tada:\n\nI know there's a lot of information in our " +
+        '[contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), ' +
+        'so here are some points to take note of :memo::\n\n1. Now that your first PR has been merged, you can be ' +
+        "hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one " +
+        'job at a time.\n2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) ' +
+        "testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for " +
+        'fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without ' +
+        'causing a regression.\n3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. ' +
+        'After it has been on production for 7 days without causing any regressions, then we pay out the Upwork ' +
+        "job. :moneybag:\n\nSo it might take a while before you're paid for your work, but we typically post " +
+        "multiple new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience " +
+        'contributing to this repo! :blush:';
+    if (isFirstPr) {
+        steps.push(
+            utils.createStepAssertion(
+                isOsBotify ? "Comment on OSBotify\\'s first pull request!" : "Comment on Dummy Author\\'s first pull request!",
+                true,
+                null,
+                'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+                'Creating comment',
+                [
+                    {key: 'github_token', value: '***'},
+                    {key: 'number', value: '12345'},
+                    {key: 'body', value: isOsBotify ? osBotifyBody : userBody},
+                ],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertChooseDeployActionsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Get merged pull request', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion('Check if StagingDeployCash is locked', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Checking StagingDeployCash', [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion('Check if merged pull request should trigger a deploy', true, ''),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertSkipDeployJobExecuted = (workflowResult, didExecute = true) => {
+    const body = ':hand: This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.';
+    const steps = [
+        utils.createStepAssertion('Comment on deferred PR', true, null, 'SKIP_DEPLOY', 'Skipping deploy', [
+            {key: 'github_token', value: '***'},
+            {key: 'number', value: '123'},
+            {key: 'body', value: body},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATE_NEW_VERSION', 'Creating new version')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Run turnstyle', true, null, 'UPDATE_STAGING', 'Running turnstyle', [
+            {key: 'poll-interval-seconds', value: '10'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+        ]),
+        utils.createStepAssertion('Checkout main', true, null, 'UPDATE_STAGING', 'Checkout main', [
+            {key: 'ref', value: 'main'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATE_STAGING', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Update staging branch from main', true, null, 'UPDATE_STAGING', 'Update staging branch from main'),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobFailed = (workflowResult, didFail = false) => {
+    const steps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATE_STAGING', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didFail) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertTypecheckJobExecuted,
+    assertLintJobExecuted,
+    assertTestJobExecuted,
+    assertIsExpensifyEmployeeJobExecuted,
+    assertNewContributorWelcomeMessageJobExecuted,
+    assertChooseDeployActionsJobExecuted,
+    assertSkipDeployJobExecuted,
+    assertCreateNewVersionJobExecuted,
+    assertUpdateStagingJobExecuted,
+    assertUpdateStagingJobFailed,
+};
diff --git a/workflow_tests/assertions/reviewerChecklistAssertions.js b/workflow_tests/assertions/reviewerChecklistAssertions.js
new file mode 100644
index 000000000000..6154b1cd28ca
--- /dev/null
+++ b/workflow_tests/assertions/reviewerChecklistAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('reviewerChecklist.js', true, null, 'CHECKLIST', 'reviewerChecklist.js', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertChecklistJobExecuted,
+};
diff --git a/workflow_tests/assertions/testAssertions.js b/workflow_tests/assertions/testAssertions.js
new file mode 100644
index 000000000000..cee379ad5903
--- /dev/null
+++ b/workflow_tests/assertions/testAssertions.js
@@ -0,0 +1,58 @@
+const utils = require('../utils/utils');
+
+const assertJestJobExecuted = (workflowResult, didExecute = true, timesExecuted = 3) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'JEST', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'JEST', 'Setup Node', [], []),
+        utils.createStepAssertion('Get number of CPU cores', true, null, 'JEST', 'Get number of CPU cores', [], []),
+        utils.createStepAssertion(
+            'Cache Jest cache',
+            true,
+            null,
+            'JEST',
+            'Cache Jest cache',
+            [
+                {key: 'path', value: '.jest-cache'},
+                {key: 'key', value: 'Linux-jest'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Jest tests', true, null, 'JEST', 'Jest tests', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            let cnt = 0;
+            workflowResult.forEach((executedStep) => {
+                if (executedStep.name !== expectedStep.name || executedStep.output !== expectedStep.output || executedStep.status !== expectedStep.status) {
+                    return;
+                }
+                cnt += 1;
+            });
+            expect(cnt).toEqual(timesExecuted);
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertShellTestsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'SHELLTESTS', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'SHELLTESTS', 'Setup Node', [], []),
+        utils.createStepAssertion('Test CI git logic', true, null, 'SHELLTESTS', 'Test CI git logic', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertJestJobExecuted,
+    assertShellTestsJobExecuted,
+};
diff --git a/workflow_tests/assertions/testBuildAssertions.js b/workflow_tests/assertions/testBuildAssertions.js
new file mode 100644
index 000000000000..a4f7a46259ad
--- /dev/null
+++ b/workflow_tests/assertions/testBuildAssertions.js
@@ -0,0 +1,413 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, pullRequestNumber = '1234', didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Is Expensify employee', true, null, 'VALIDATEACTOR', 'Is Expensify employee', [], [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion(
+            'Set HAS_READY_TO_BUILD_LABEL flag',
+            true,
+            null,
+            'VALIDATEACTOR',
+            'Set HAS_READY_TO_BUILD_LABEL flag',
+            [],
+            [
+                {key: 'PULL_REQUEST_NUMBER', value: pullRequestNumber},
+                {key: 'GITHUB_TOKEN', value: '***'},
+            ],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertGetBranchRefJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'GETBRANCHREF', 'Checkout', [], []),
+        utils.createStepAssertion(
+            'Check if pull request number is correct',
+            true,
+            null,
+            'GETBRANCHREF',
+            'Check if pull request number is correct',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertAndroidJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'ANDROID', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion(
+            'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+            true,
+            null,
+            'ANDROID',
+            'Creating .env.adhoc file based on staging',
+            [],
+            [],
+        ),
+        utils.createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setup Node', [], []),
+        utils.createStepAssertion(
+            'Setup Ruby',
+            true,
+            null,
+            'ANDROID',
+            'Setup Ruby',
+            [
+                {key: 'ruby-version', value: '2.7'},
+                {key: 'bundler-cache', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypt keystore', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypt json key', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'ANDROID',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
+        utils.createStepAssertion(
+            'Run Fastlane beta test',
+            true,
+            null,
+            'ANDROID',
+            'Run Fastlane beta test',
+            [],
+            [
+                {key: 'S3_ACCESS_KEY', value: '***'},
+                {key: 'S3_SECRET_ACCESS_KEY', value: '***'},
+                {key: 'S3_BUCKET', value: 'ad-hoc-expensify-cash'},
+                {key: 'S3_REGION', value: 'us-east-1'},
+                {key: 'MYAPP_UPLOAD_STORE_PASSWORD', value: '***'},
+                {key: 'MYAPP_UPLOAD_KEY_PASSWORD', value: '***'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Upload Artifact',
+            true,
+            null,
+            'ANDROID',
+            'Upload Artifact',
+            [
+                {key: 'name', value: 'android'},
+                {key: 'path', value: './android_paths.json'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertIOSJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'IOS', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it', true, null, 'IOS', 'Creating .env.adhoc file based on staging', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'IOS', 'Setup Node', [], []),
+        utils.createStepAssertion('Setup XCode', true, null, 'IOS', 'Setup XCode', [], []),
+        utils.createStepAssertion(
+            'Setup Ruby',
+            true,
+            null,
+            'IOS',
+            'Setup Ruby',
+            [
+                {key: 'ruby-version', value: '2.7'},
+                {key: 'bundler-cache', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [
+            {key: 'path', value: 'ios/Pods'},
+            {key: 'key', value: 'Linux-pods-cache-'},
+            {key: 'restore-keys', value: 'Linux-pods-cache-'},
+        ]),
+        utils.createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
+        utils.createStepAssertion(
+            'Install cocoapods',
+            true,
+            null,
+            'IOS',
+            'Install cocoapods',
+            [
+                {key: 'timeout_minutes', value: '10'},
+                {key: 'max_attempts', value: '5'},
+                {key: 'command', value: 'cd ios && bundle exec pod install'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Decrypt profile', true, null, 'IOS', 'Decrypt profile', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypt certificate', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'IOS',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Run Fastlane',
+            true,
+            null,
+            'IOS',
+            'Run Fastlane',
+            [],
+            [
+                {key: 'S3_ACCESS_KEY', value: '***'},
+                {key: 'S3_SECRET_ACCESS_KEY', value: '***'},
+                {key: 'S3_BUCKET', value: 'ad-hoc-expensify-cash'},
+                {key: 'S3_REGION', value: 'us-east-1'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Upload Artifact',
+            true,
+            null,
+            'IOS',
+            'Upload Artifact',
+            [
+                {key: 'name', value: 'ios'},
+                {key: 'path', value: './ios_paths.json'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertDesktopJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion(
+            'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+            true,
+            null,
+            'DESKTOP',
+            'Creating .env.adhoc file based on staging',
+            [],
+            [],
+        ),
+        utils.createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setup Node', [], []),
+        utils.createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypt Developer ID Certificate', [], [{key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'DESKTOP',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Build desktop app for testing',
+            true,
+            null,
+            'DESKTOP',
+            'Build desktop app for testing',
+            [],
+            [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertWebJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'WEB', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it', true, null, 'WEB', 'Creating .env.adhoc file based on staging', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'WEB', 'Setup Node', [], []),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'WEB',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Build web for testing', true, null, 'WEB', 'Build web for testing', [], []),
+        utils.createStepAssertion('Build docs', true, null, 'WEB', 'Build docs', [], []),
+        utils.createStepAssertion('Deploy to S3 for internal testing', true, null, 'WEB', 'Deploy to S3 for internal testing', [], []),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostGithubCommentJobExecuted = (
+    workflowResult,
+    ref = '',
+    pullRequestNumber = '1234',
+    didExecute = true,
+    androidStatus = 'success',
+    iOSStatus = 'success',
+    desktopStatus = 'success',
+    webStatus = 'success',
+) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POSTGITHUBCOMMENT', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Download Artifact', true, null, 'POSTGITHUBCOMMENT', 'Download Artifact', [], []),
+    ];
+    if (androidStatus === 'success') {
+        steps.push(utils.createStepAssertion('Read JSONs with android paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with android paths', [], []));
+    }
+    if (iOSStatus === 'success') {
+        steps.push(utils.createStepAssertion('Read JSONs with iOS paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with iOS paths', [], []));
+    }
+    steps.push(
+        utils.createStepAssertion(
+            'maintain-comment',
+            true,
+            null,
+            'POSTGITHUBCOMMENT',
+            'maintain-comment',
+            [
+                {key: 'token', value: '***'},
+                {key: 'body-include', value: 'Use the links below to test this build in android and iOS. Happy testing!'},
+                {key: 'number', value: pullRequestNumber},
+                {key: 'delete', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Publish links to apps for download',
+            true,
+            null,
+            'POSTGITHUBCOMMENT',
+            'Publish links to apps for download',
+            [
+                {key: 'PR_NUMBER', value: pullRequestNumber},
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ANDROID', value: androidStatus},
+                {key: 'DESKTOP', value: desktopStatus},
+                {key: 'IOS', value: iOSStatus},
+                {key: 'WEB', value: webStatus},
+                {key: 'ANDROID_LINK', value: androidStatus === 'success' ? 'http://dummy.android.link' : ''},
+                {key: 'DESKTOP_LINK', value: `https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${pullRequestNumber}/NewExpensify.dmg`},
+                {key: 'IOS_LINK', value: iOSStatus === 'success' ? 'http://dummy.ios.link' : ''},
+                {key: 'WEB_LINK', value: `https://${pullRequestNumber}.pr-testing.expensify.com`},
+            ],
+            [],
+        ),
+    );
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertGetBranchRefJobExecuted,
+    assertAndroidJobExecuted,
+    assertIOSJobExecuted,
+    assertDesktopJobExecuted,
+    assertWebJobExecuted,
+    assertPostGithubCommentJobExecuted,
+};
diff --git a/workflow_tests/assertions/validateGithubActionsAssertions.js b/workflow_tests/assertions/validateGithubActionsAssertions.js
new file mode 100644
index 000000000000..fb5f58d2b5ed
--- /dev/null
+++ b/workflow_tests/assertions/validateGithubActionsAssertions.js
@@ -0,0 +1,22 @@
+const utils = require('../utils/utils');
+
+const assertVerifyJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
+        utils.createStepAssertion('Verify Javascript Action Builds', true, null, 'VERIFY', 'Verify Javascript Action Builds', [], []),
+        utils.createStepAssertion('Validate actions and workflows', true, null, 'VERIFY', 'Validate actions and workflows', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyJobExecuted,
+};
diff --git a/workflow_tests/assertions/verifyPodfileAssertions.js b/workflow_tests/assertions/verifyPodfileAssertions.js
new file mode 100644
index 000000000000..e0cc50570fec
--- /dev/null
+++ b/workflow_tests/assertions/verifyPodfileAssertions.js
@@ -0,0 +1,21 @@
+const utils = require('../utils/utils');
+
+const assertVerifyJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
+        utils.createStepAssertion('Verify podfile', true, null, 'VERIFY', 'Verify podfile', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyJobExecuted,
+};
diff --git a/workflow_tests/assertions/verifySignedCommitsAssertions.js b/workflow_tests/assertions/verifySignedCommitsAssertions.js
new file mode 100644
index 000000000000..458bc684363f
--- /dev/null
+++ b/workflow_tests/assertions/verifySignedCommitsAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertVerifySignedCommitsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Verify signed commits', true, null, 'VERIFYSIGNEDCOMMITS', 'Verify signed commits', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifySignedCommitsJobExecuted,
+};
diff --git a/workflow_tests/authorChecklist.test.js b/workflow_tests/authorChecklist.test.js
new file mode 100644
index 000000000000..64a25c8fe1b8
--- /dev/null
+++ b/workflow_tests/authorChecklist.test.js
@@ -0,0 +1,181 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'authorChecklist.yml'),
+        dest: '.github/workflows/authorChecklist.yml',
+    },
+];
+
+describe('test workflow authorChecklist', () => {
+    const githubToken = 'dummy_github_token';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testAuthorChecklistWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request edited', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'edited',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request reopened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'reopened',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/cherryPick.test.js b/workflow_tests/cherryPick.test.js
new file mode 100644
index 000000000000..592170a7c64e
--- /dev/null
+++ b/workflow_tests/cherryPick.test.js
@@ -0,0 +1,391 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'cherryPick.yml'),
+        dest: '.github/workflows/cherryPick.yml',
+    },
+];
+
+describe('test workflow cherryPick', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testCherryPickWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('manual workflow dispatch', () => {
+        const event = 'workflow_dispatch';
+        describe('actor is not deployer', () => {
+            const actor = 'Dummy Author';
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    event,
+                    null,
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                    'dummy_github_token',
+                    null,
+                    {
+                        PULL_REQUEST_NUMBER: '1234',
+                    },
+                );
+                const testMockSteps = {
+                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+                    cherryPick: mocks.getCherryPickMockSteps(true, false),
+                };
+                const testMockJobs = {
+                    createNewVersion: {
+                        steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertCherryPickJobExecuted(result, actor, '1234', false);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            const mergeConflicts = false;
+            const versionsMatch = true;
+            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);
+                const testMockSteps = {
+                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+                    cherryPick: mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts),
+                };
+                const testMockJobs = {
+                    createNewVersion: {
+                        steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                act = utils.setUpActParams(
+                    act,
+                    event,
+                    null,
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                    'dummy_github_token',
+                    null,
+                    {
+                        PULL_REQUEST_NUMBER: '1234',
+                    },
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+                assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+            });
+        });
+        describe('actor is a deployer', () => {
+            const actor = 'Dummy Author';
+            describe('no merge conflicts', () => {
+                const mergeConflicts = false;
+                describe('version match', () => {
+                    const versionsMatch = true;
+                    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);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+                    });
+                });
+                describe('version does not match', () => {
+                    const versionsMatch = false;
+                    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);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+                    });
+                });
+            });
+            describe('merge conflicts', () => {
+                const mergeConflicts = true;
+                describe('version match', () => {
+                    const versionsMatch = true;
+                    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);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true, true);
+                    });
+                });
+                describe('version does not match', () => {
+                    const versionsMatch = false;
+                    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);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true, true);
+                    });
+                });
+            });
+        });
+    });
+    describe('automatic trigger', () => {
+        const event = 'pull_request';
+        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);
+            act = utils.setUpActParams(
+                act,
+                event,
+                null,
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                },
+                'dummy_github_token',
+                null,
+                {
+                    PULL_REQUEST_NUMBER: '1234',
+                },
+            );
+            const testMockSteps = {
+                validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                cherryPick: mocks.getCherryPickMockSteps(true, false),
+            };
+            const testMockJobs = {
+                createNewVersion: {
+                    steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Author',
+                logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+
+            assertions.assertValidateActorJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertCherryPickJobExecuted(result, 'Dummy Author', '1234', false);
+        });
+    });
+});
diff --git a/workflow_tests/cla.test.js b/workflow_tests/cla.test.js
new file mode 100644
index 000000000000..301aa7587f53
--- /dev/null
+++ b/workflow_tests/cla.test.js
@@ -0,0 +1,196 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'cla.yml'),
+        dest: '.github/workflows/cla.yml',
+    },
+];
+
+describe('test workflow cla', () => {
+    const secrets = {
+        CLA_BOTIFY_TOKEN: 'dummy_cla_botify_token',
+    };
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Author';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testClaWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is issue_comment', () => {
+        const event = 'issue_comment';
+        describe('no regex matches', () => {
+            const commentBody = 'Comment body';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, false);
+            });
+        });
+        describe('check regex matches', () => {
+            const commentBody = 'I have read the CLA Document and I hereby sign the CLA';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__CHECK_MATCH__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, true);
+            });
+        });
+        describe('re-check regex matches', () => {
+            const commentBody = 'recheck';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, true);
+            });
+        });
+    });
+    describe('event is pull_request_target', () => {
+        const event = 'pull_request_target';
+        describe("no regex matches - there's no comment", () => {
+            const eventData = {
+                action: 'opened',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, '', `${repoPath}/remote/origin`, true, true);
+            });
+        });
+    });
+    describe('different event', () => {
+        const event = 'push';
+        it('workflow does not execute', async () => {
+            const eventData = {
+                ref: 'main',
+            };
+            const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+            const testMockSteps = {
+                CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+            });
+
+            assertions.assertCLAJobExecuted(result, '', `${repoPath}/remote/origin`, false);
+        });
+    });
+});
diff --git a/workflow_tests/createNewVersion.test.js b/workflow_tests/createNewVersion.test.js
new file mode 100644
index 000000000000..259e06450325
--- /dev/null
+++ b/workflow_tests/createNewVersion.test.js
@@ -0,0 +1,166 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000); // 90 sec
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'createNewVersion.yml'),
+        dest: '.github/workflows/createNewVersion.yml',
+    },
+];
+
+describe('test workflow createNewVersion', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testCreateNewVersionWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const inputs = {
+            SEMVER_LEVEL: 'BUILD',
+        };
+        const secrets = {
+            LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+            SLACK_WEBHOOK: 'dummy_webhook',
+        };
+        const githubToken = 'dummy_github_token';
+
+        describe('actor is admin', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS;
+            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);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+            });
+        });
+
+        describe('actor is writer', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS;
+            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);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+            });
+        });
+
+        describe('actor is reader', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS;
+            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);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, 'BUILD', false);
+            });
+        });
+
+        describe('one step fails', () => {
+            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);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+                    createNewVersion: utils.deepCopy(mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS),
+                };
+                testMockSteps.createNewVersion[5] = utils.createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], [], [], [], false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, 'BUILD', true, false);
+            });
+        });
+
+        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);
+            act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, {SEMVER_LEVEL: 'MAJOR'});
+            act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+                createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Author',
+                logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+            });
+            assertions.assertValidateActorJobExecuted(result);
+            assertions.assertCreateNewVersionJobExecuted(result, 'MAJOR');
+        });
+    });
+});
diff --git a/workflow_tests/deploy.test.js b/workflow_tests/deploy.test.js
new file mode 100644
index 000000000000..a2ccdebc0b31
--- /dev/null
+++ b/workflow_tests/deploy.test.js
@@ -0,0 +1,183 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'deploy.yml'),
+        dest: '.github/workflows/deploy.yml',
+    },
+];
+
+describe('test workflow deploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('push', () => {
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/main',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result, false);
+            assertions.assertDeployProductionJobExecuted(result, false);
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/staging',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result);
+            assertions.assertDeployProductionJobExecuted(result, false);
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/production',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result, false);
+            assertions.assertDeployProductionJobExecuted(result);
+        });
+    });
+
+    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);
+        const testMockSteps = {
+            deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+            deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+        };
+
+        // pull_request
+        act = utils.setUpActParams(
+            act,
+            'pull_request',
+            {head: {ref: 'main'}},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        let result = await act.runEvent('pull_request', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Author',
+            logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+        });
+        assertions.assertDeployStagingJobExecuted(result, false);
+        assertions.assertDeployProductionJobExecuted(result, false);
+
+        // workflow_dispatch
+        act = utils.setUpActParams(
+            act,
+            'workflow_dispatch',
+            {},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        result = await act.runEvent('workflow_dispatch', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Author',
+            logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+        });
+        assertions.assertDeployStagingJobExecuted(result, false);
+        assertions.assertDeployProductionJobExecuted(result, false);
+    });
+});
diff --git a/workflow_tests/deployBlocker.test.js b/workflow_tests/deployBlocker.test.js
new file mode 100644
index 000000000000..1cfca11c90f5
--- /dev/null
+++ b/workflow_tests/deployBlocker.test.js
@@ -0,0 +1,135 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'deployBlocker.yml'),
+        dest: '.github/workflows/deployBlocker.yml',
+    },
+];
+
+describe('test workflow deployBlocker', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Author';
+    const secrets = {
+        OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+        SLACK_WEBHOOK: 'dummy_slack_webhook',
+    };
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testDeployBlockerWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue labeled', () => {
+        const event = 'issues';
+        const eventOptions = {
+            action: 'labeled',
+            label: {
+                name: 'DeployBlockerCash',
+            },
+            issue: {
+                title: 'Labeled issue title',
+                number: '1234',
+                html_url: 'http://issue.html.url',
+            },
+        };
+        describe('label is DeployBlockerCash', () => {
+            const testEventOptions = utils.deepCopy(eventOptions);
+            testEventOptions.label = {name: 'DeployBlockerCash'};
+            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);
+                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                const testMockSteps = {
+                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                });
+
+                assertions.assertDeployBlockerJobExecuted(result, 'Labeled issue title', '1234');
+            });
+            describe('one step fails', () => {
+                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);
+                    act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                    const testMockSteps = {
+                        deployBlocker: utils.deepCopy(mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS),
+                    };
+                    testMockSteps.deployBlocker[2] = utils.createMockStep(
+                        'Update StagingDeployCash with new deploy blocker',
+                        'Update StagingDeployCash with new deploy blocker',
+                        'DEPLOYBLOCKER',
+                        ['GITHUB_TOKEN'],
+                        [],
+                        {},
+                        {},
+                        false,
+                    );
+                    const result = await act.runEvent(event, {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                        mockSteps: testMockSteps,
+                        actor,
+                        logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                    });
+
+                    assertions.assertDeployBlockerJobExecuted(result, 'Labeled issue title', '1234', true, false);
+                });
+            });
+        });
+        describe('label is different', () => {
+            const testEventOptions = utils.deepCopy(eventOptions);
+            testEventOptions.label = {name: 'Different Label'};
+            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);
+                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                const testMockSteps = {
+                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                });
+
+                assertions.assertDeployBlockerJobExecuted(result, '', '', false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/finishReleaseCycle.test.js b/workflow_tests/finishReleaseCycle.test.js
new file mode 100644
index 000000000000..7c17ca8d4122
--- /dev/null
+++ b/workflow_tests/finishReleaseCycle.test.js
@@ -0,0 +1,247 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'finishReleaseCycle.yml'),
+        dest: '.github/workflows/finishReleaseCycle.yml',
+    },
+];
+
+describe('test workflow finishReleaseCycle', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testFinishReleaseCycleWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue closed', () => {
+        describe('issue has StagingDeployCash', () => {
+            describe('actor is a team member', () => {
+                describe('no deploy blockers', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'closed',
+                                type: 'closed',
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                    number: '1234',
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        const testMockSteps = {
+                            validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                            updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                            updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                        };
+                        const testMockJobs = {
+                            createNewPatchVersion: {
+                                steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+                        assertions.assertValidateJobExecuted(result, '1234');
+                        assertions.assertUpdateProductionJobExecuted(result);
+                        assertions.assertCreateNewPatchVersionJobExecuted(result);
+                        assertions.assertUpdateStagingJobExecuted(result);
+                    });
+                });
+                describe('deploy blockers', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'closed',
+                                type: 'closed',
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                    number: '1234',
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        const testMockSteps = {
+                            validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+                            updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                            updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                        };
+                        const testMockJobs = {
+                            createNewPatchVersion: {
+                                steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+                        assertions.assertValidateJobExecuted(result, '1234', true, true, true);
+                        assertions.assertUpdateProductionJobExecuted(result, false);
+                        assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                        assertions.assertUpdateStagingJobExecuted(result, false);
+                    });
+                });
+            });
+            describe('actor is not a team member', () => {
+                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);
+                    act = utils.setUpActParams(
+                        act,
+                        'issues',
+                        {
+                            action: 'closed',
+                            type: 'closed',
+                            issue: {
+                                labels: [{name: 'StagingDeployCash'}],
+                                number: '1234',
+                            },
+                        },
+                        {
+                            OS_BOTIFY_TOKEN: 'dummy_token',
+                            LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                            SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        },
+                    );
+                    const testMockSteps = {
+                        validate: mocks.FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                        updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                        updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                    };
+                    const testMockJobs = {
+                        createNewPatchVersion: {
+                            steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                            outputs: {
+                                // eslint-disable-next-line no-template-curly-in-string
+                                NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                            },
+                            runsOn: 'ubuntu-latest',
+                        },
+                    };
+                    const result = await act.runEvent('issues', {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                        mockSteps: testMockSteps,
+                        actor: 'Dummy Author',
+                        logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                        mockJobs: testMockJobs,
+                    });
+                    assertions.assertValidateJobExecuted(result, '1234', true, false, false);
+                    assertions.assertUpdateProductionJobExecuted(result, false);
+                    assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                    assertions.assertUpdateStagingJobExecuted(result, false);
+                });
+            });
+        });
+        describe('issue does not have StagingDeployCash', () => {
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    'issues',
+                    {
+                        action: 'closed',
+                        type: 'closed',
+                        issue: {
+                            labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                            number: '1234',
+                        },
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                );
+                const testMockSteps = {
+                    validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                    updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                    updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                };
+                const testMockJobs = {
+                    createNewPatchVersion: {
+                        steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('issues', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertValidateJobExecuted(result, '1234', false);
+                assertions.assertUpdateProductionJobExecuted(result, false);
+                assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/jest.config.js b/workflow_tests/jest.config.js
new file mode 100644
index 000000000000..c8a4534764e3
--- /dev/null
+++ b/workflow_tests/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+    verbose: true,
+    transform: {
+        '^.+\\.jsx?$': 'babel-jest',
+    },
+    clearMocks: true,
+    resetMocks: true,
+};
diff --git a/workflow_tests/lint.test.js b/workflow_tests/lint.test.js
new file mode 100644
index 000000000000..bc51f31b657c
--- /dev/null
+++ b/workflow_tests/lint.test.js
@@ -0,0 +1,154 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'lint.yml'),
+        dest: '.github/workflows/lint.yml',
+    },
+];
+
+describe('test workflow lint', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testLintWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const eventOptions = {};
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                lint: mocks.LINT__LINT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+            });
+
+            assertions.assertLintJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            const testActor = 'OSBotify';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor: testActor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+        });
+    });
+    describe('event is pull_request', () => {
+        const event = 'pull_request';
+        describe('pull_request is opened', () => {
+            const eventOptions = {
+                action: 'opened',
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+            describe('actor is OSBotify', () => {
+                const testActor = 'OSBotify';
+                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);
+                    act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                    const testMockSteps = {
+                        lint: mocks.LINT__LINT__STEP_MOCKS,
+                    };
+                    const result = await act.runEvent(event, {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                        mockSteps: testMockSteps,
+                        actor: testActor,
+                        logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                    });
+
+                    assertions.assertLintJobExecuted(result, false);
+                });
+            });
+        });
+        describe('pull_request is synchronized', () => {
+            const eventOptions = {
+                action: 'synchronize',
+            };
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/lockDeploys.test.js b/workflow_tests/lockDeploys.test.js
new file mode 100644
index 000000000000..a57ed8847fd3
--- /dev/null
+++ b/workflow_tests/lockDeploys.test.js
@@ -0,0 +1,458 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'lockDeploys.yml'),
+        dest: '.github/workflows/lockDeploys.yml',
+    },
+];
+
+describe('test workflow lockDeploys', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testLockDeploysWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue labeled', () => {
+        describe('label is LockCashDeploys', () => {
+            describe('issue has StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result);
+                    });
+
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        testMockSteps.lockStagingDeploys[1] = utils.createMockStep(
+                            'Wait for staging deploys to finish',
+                            'Waiting for staging deploys to finish',
+                            'LOCKSTAGINGDEPLOYS',
+                            ['GITHUB_TOKEN'],
+                            [],
+                            null,
+                            null,
+                            false,
+                        );
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobFailedAfterFirstStep(result);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+
+            describe('issue does not have StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+        });
+
+        describe('label is not LockCashDeploys', () => {
+            describe('issue has StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some different label',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some different label',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+
+            describe('issue does not have StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some other label',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    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);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some other label',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+        });
+    });
+});
diff --git a/workflow_tests/mocks/authorChecklistMocks.js b/workflow_tests/mocks/authorChecklistMocks.js
new file mode 100644
index 000000000000..db211f5ec1e6
--- /dev/null
+++ b/workflow_tests/mocks/authorChecklistMocks.js
@@ -0,0 +1,9 @@
+const utils = require('../utils/utils');
+
+// checklist
+const AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK = utils.createMockStep('authorChecklist.js', 'Running authorChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS = [AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK];
+
+module.exports = {
+    AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/cherryPickMocks.js b/workflow_tests/mocks/cherryPickMocks.js
new file mode 100644
index 000000000000..778e6fd48ded
--- /dev/null
+++ b/workflow_tests/mocks/cherryPickMocks.js
@@ -0,0 +1,114 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if user is a deployer',
+    'VALIDATEACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if user is a deployer',
+    'VALIDATEACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+const CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK];
+const CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK];
+
+// createnewversion
+const CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATENEWVERSION',
+    [],
+    [],
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const CHERRYPICK__CREATENEWVERSION__STEP_MOCKS = [CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+
+// cherrypick
+const CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'CHERRYPICK', ['ref', 'token'], []);
+const CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep('Set up git for OSBotify', 'Setting up git for OSBotify', 'CHERRYPICK', ['GPG_PASSPHRASE'], []);
+const CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK = utils.createMockStep('Get previous app version', 'Get previous app version', 'CHERRYPICK', ['SEMVER_LEVEL']);
+const CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK = utils.createMockStep('Fetch history of relevant refs', 'Fetch history of relevant refs', 'CHERRYPICK');
+const CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK = utils.createMockStep('Get version bump commit', 'Get version bump commit', 'CHERRYPICK', [], [], {
+    VERSION_BUMP_SHA: 'version_bump_sha',
+});
+const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK = utils.createMockStep(
+    'Get merge commit for pull request to CP',
+    'Get merge commit for pull request to CP',
+    'CHERRYPICK',
+    ['GITHUB_TOKEN', 'USER', 'PULL_REQUEST_NUMBER'],
+    [],
+    {MERGE_ACTOR: '@dummyauthor'},
+);
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the version-bump to staging',
+    'Cherry-picking the version-bump to staging',
+    'CHERRYPICK',
+    [],
+    [],
+);
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the merge commit of target PR',
+    'Cherry-picking the merge commit of target PR',
+    'CHERRYPICK',
+    [],
+    [],
+    {HAS_CONFLICTS: false},
+);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the merge commit of target PR',
+    'Cherry-picking the merge commit of target PR',
+    'CHERRYPICK',
+    [],
+    [],
+    {HAS_CONFLICTS: true},
+);
+const CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK = utils.createMockStep('Push changes', 'Pushing changes', 'CHERRYPICK', [], []);
+const CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK = utils.createMockStep(
+    'Create Pull Request to manually finish CP',
+    'Creating Pull Request to manually finish CP',
+    'CHERRYPICK',
+    [],
+    ['GITHUB_TOKEN'],
+);
+const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+    'Announces a CP failure in the #announce Slack room',
+    'Announcing a CP failure',
+    'CHERRYPICK',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+
+const getCherryPickMockSteps = (upToDate, hasConflicts) => [
+    CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK,
+    hasConflicts
+        ? CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK
+        : CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK,
+];
+
+module.exports = {
+    CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+    CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+    CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+    getCherryPickMockSteps,
+};
diff --git a/workflow_tests/mocks/claMocks.js b/workflow_tests/mocks/claMocks.js
new file mode 100644
index 000000000000..d0a6793b93e6
--- /dev/null
+++ b/workflow_tests/mocks/claMocks.js
@@ -0,0 +1,25 @@
+const utils = require('../utils/utils');
+
+// cla
+const CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {
+    match: 'I have read the CLA Document and I hereby sign the CLA',
+});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: 'recheck'});
+const CLA__CLA__CLA_ASSISTANT__STEP_MOCK = utils.createMockStep(
+    'CLA Assistant',
+    'CLA Assistant',
+    'CLA',
+    ['path-to-signatures', 'path-to-document', 'branch', 'remote-organization-name', 'remote-repository-name', 'lock-pullrequest-aftermerge', 'allowlist'],
+    ['GITHUB_TOKEN', 'PERSONAL_ACCESS_TOKEN'],
+);
+const CLA__CLA__NO_MATCHES__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+const CLA__CLA__CHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+const CLA__CLA__RECHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+
+module.exports = {
+    CLA__CLA__NO_MATCHES__STEP_MOCKS,
+    CLA__CLA__CHECK_MATCH__STEP_MOCKS,
+    CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/createNewVersionMocks.js b/workflow_tests/mocks/createNewVersionMocks.js
new file mode 100644
index 000000000000..a1f601aef47f
--- /dev/null
+++ b/workflow_tests/mocks/createNewVersionMocks.js
@@ -0,0 +1,58 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'admin',
+});
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'write',
+});
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'read',
+});
+const CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK];
+const CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK];
+const CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK];
+
+// createnewversion
+const CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK = utils.createMockStep('Run turnstyle', 'Run turnstyle', 'CREATENEWVERSION', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK = utils.createMockStep('Check out', 'Check out', 'CREATENEWVERSION', ['ref', 'token'], []);
+const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup git for OSBotify',
+    'Setup git for OSBotify',
+    'CREATENEWVERSION',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = utils.createMockStep(
+    'Generate version',
+    'Generate version',
+    'CREATENEWVERSION',
+    ['GITHUB_TOKEN', 'SEMVER_LEVEL'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK = utils.createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK = utils.createMockStep('Update main branch', 'Update main branch', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'CREATENEWVERSION',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS = [
+    CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+    CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS,
+    CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS,
+    CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/deployBlockerMocks.js b/workflow_tests/mocks/deployBlockerMocks.js
new file mode 100644
index 000000000000..fbfc676f7701
--- /dev/null
+++ b/workflow_tests/mocks/deployBlockerMocks.js
@@ -0,0 +1,68 @@
+const utils = require('../utils/utils');
+
+// deployblocker
+const DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DEPLOYBLOCKER', ['token'], []);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__GET_URL_TITLE_AND_NUMBER_OF_NEW_DEPLOY_BLOCKER_ISSUE__STEP_MOCK = utils.createMockStep(
+    'Get URL, title, & number of new deploy blocker (issue)',
+    'Get URL, title and number of new deploy blocker - issue',
+    'DEPLOYBLOCKER',
+    [],
+    ['TITLE'],
+    {},
+    {
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_URL: '${{ github.event.issue.html_url }}',
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_NUMBER: '${{ github.event.issue.number }}',
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_TITLE: '${{ github.event.issue.title }}',
+    },
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__UPDATE_STAGINGDEPLOYCASH_WITH_NEW_DEPLOY_BLOCKER__STEP_MOCK = utils.createMockStep(
+    'Update StagingDeployCash with new deploy blocker',
+    'Update StagingDeployCash with new deploy blocker',
+    'DEPLOYBLOCKER',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_THE_ISSUE_OR_PR_THE_HOURLY_ENGINEERING_LABELS__STEP_MOCK = utils.createMockStep(
+    'Give the issue/PR the Hourly, Engineering labels',
+    'Give the issue/PR the Hourly, Engineering labels',
+    'DEPLOYBLOCKER',
+    ['add-labels', 'remove-labels'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+    'Post the issue in the #expensify-open-source slack room',
+    'Post the issue in the expensify-open-source slack room',
+    'DEPLOYBLOCKER',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEFERRED_PR__STEP_MOCK = utils.createMockStep(
+    'Comment on deferred PR',
+    'Comment on deferred PR',
+    'DEPLOYBLOCKER',
+    ['github_token', 'number'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'DEPLOYBLOCKER',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS = [
+    DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__GET_URL_TITLE_AND_NUMBER_OF_NEW_DEPLOY_BLOCKER_ISSUE__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__UPDATE_STAGINGDEPLOYCASH_WITH_NEW_DEPLOY_BLOCKER__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_THE_ISSUE_OR_PR_THE_HOURLY_ENGINEERING_LABELS__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEFERRED_PR__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/deployMocks.js b/workflow_tests/mocks/deployMocks.js
new file mode 100644
index 000000000000..dfec48ca7dc3
--- /dev/null
+++ b/workflow_tests/mocks/deployMocks.js
@@ -0,0 +1,44 @@
+const utils = require('../utils/utils');
+
+const DEPLOY_STAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'DEPLOY_STAGING', ['ref', 'token']);
+const DEPLOY_STAGING__SETUP_GIT__STEP_MOCK = utils.createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_STAGING', ['GPG_PASSPHRASE']);
+const DEPLOY_STAGING__TAG_VERSION__STEP_MOCK = utils.createMockStep('Tag version', 'Tagging new version', 'DEPLOY_STAGING');
+const DEPLOY_STAGING__PUSH_TAG__STEP_MOCK = utils.createMockStep('🚀 Push tags to trigger staging deploy 🚀', 'Pushing tag to trigger staging deploy', 'DEPLOY_STAGING');
+const DEPLOY_STAGING_STEP_MOCKS = [DEPLOY_STAGING__CHECKOUT__STEP_MOCK, DEPLOY_STAGING__SETUP_GIT__STEP_MOCK, DEPLOY_STAGING__TAG_VERSION__STEP_MOCK, DEPLOY_STAGING__PUSH_TAG__STEP_MOCK];
+
+const DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DEPLOY_PRODUCTION', ['ref', 'token']);
+const DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK = utils.createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_PRODUCTION', ['GPG_PASSPHRASE']);
+const DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK = utils.createMockStep('Get current app version', 'Getting current app version', 'DEPLOY_PRODUCTION', null, null, null, {
+    PRODUCTION_VERSION: '1.2.3',
+});
+const DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK = utils.createMockStep(
+    'Get Release Pull Request List',
+    'Getting release PR list',
+    'DEPLOY_PRODUCTION',
+    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
+    null,
+    {PR_LIST: '["1.2.1", "1.2.2"]'},
+);
+const DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK = utils.createMockStep('Generate Release Body', 'Generating release body', 'DEPLOY_PRODUCTION', ['PR_LIST'], null, {
+    RELEASE_BODY: 'Release body',
+});
+const DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK = utils.createMockStep(
+    '🚀 Create release to trigger production deploy 🚀',
+    'Creating release to trigger production deploy',
+    'DEPLOY_PRODUCTION',
+    ['tag_name', 'body'],
+    ['GITHUB_TOKEN'],
+);
+const DEPLOY_PRODUCTION_STEP_MOCKS = [
+    DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK,
+    DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK,
+    DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK,
+    DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK,
+    DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK,
+    DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK,
+];
+
+module.exports = {
+    DEPLOY_STAGING_STEP_MOCKS,
+    DEPLOY_PRODUCTION_STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/finishReleaseCycleMocks.js b/workflow_tests/mocks/finishReleaseCycleMocks.js
new file mode 100644
index 000000000000..e1bb0d112429
--- /dev/null
+++ b/workflow_tests/mocks/finishReleaseCycleMocks.js
@@ -0,0 +1,165 @@
+const utils = require('../utils/utils');
+
+// validate
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+    'Validate actor is deployer',
+    'Validating if actor is deployer',
+    'VALIDATE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+    'Validate actor is deployer',
+    'Validating if actor is deployer',
+    'VALIDATE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+    'Reopen and comment on issue (not a team member)',
+    'Reopening issue - not a team member',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER', 'COMMENT'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK = utils.createMockStep(
+    'Check for any deploy blockers',
+    'Checking for deploy blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+    {HAS_DEPLOY_BLOCKERS: false},
+);
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK = utils.createMockStep(
+    'Check for any deploy blockers',
+    'Checking for deploy blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+    {HAS_DEPLOY_BLOCKERS: true},
+);
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK = utils.createMockStep(
+    'Reopen and comment on issue (has blockers)',
+    'Reopening issue - blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'VALIDATE',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+// updateproduction
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATEPRODUCTION', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup Git for OSBotify',
+    'Setup Git for OSBotify',
+    'UPDATEPRODUCTION',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK = utils.createMockStep('Update production branch', 'Updating production branch', 'UPDATEPRODUCTION', [], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'UPDATEPRODUCTION',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS = [
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+// createnewpatchversion
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATENEWPATCHVERSION',
+    ['SEMVER_LEVEL'],
+    [],
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS = [FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+
+// updatestaging
+const FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATESTAGING', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup Git for OSBotify',
+    'Setup Git for OSBotify',
+    'UPDATESTAGING',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK = utils.createMockStep(
+    'Update staging branch to trigger staging deploy',
+    'Updating staging branch',
+    'UPDATESTAGING',
+    [],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'UPDATESTAGING',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS = [
+    FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+    FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+    FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/lintMocks.js b/workflow_tests/mocks/lintMocks.js
new file mode 100644
index 000000000000..ecf11074e20f
--- /dev/null
+++ b/workflow_tests/mocks/lintMocks.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+// lint
+const LINT__LINT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'LINT', [], []);
+const LINT__LINT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'LINT', [], []);
+const LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK = utils.createMockStep('Lint JavaScript and Typescript with ESLint', 'Lint JavaScript with ESLint', 'LINT', [], ['CI']);
+const LINT__LINT__LINT_SHELL_SCRIPTS_WITH_SHELLCHECK__STEP_MOCK = utils.createMockStep('Lint shell scripts with ShellCheck', 'Lint shell scripts with ShellCheck', 'LINT', [], []);
+const LINT__LINT__STEP_MOCKS = [
+    LINT__LINT__CHECKOUT__STEP_MOCK,
+    LINT__LINT__SETUP_NODE__STEP_MOCK,
+    LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK,
+    LINT__LINT__LINT_SHELL_SCRIPTS_WITH_SHELLCHECK__STEP_MOCK,
+];
+
+module.exports = {
+    LINT__LINT__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/lockDeploysMocks.js b/workflow_tests/mocks/lockDeploysMocks.js
new file mode 100644
index 000000000000..bb6246a2e1d9
--- /dev/null
+++ b/workflow_tests/mocks/lockDeploysMocks.js
@@ -0,0 +1,35 @@
+const utils = require('../utils/utils');
+
+// lockstagingdeploys
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'LOCKSTAGINGDEPLOYS', ['ref', 'token'], []);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK = utils.createMockStep(
+    'Wait for staging deploys to finish',
+    'Waiting for staging deploys to finish',
+    'LOCKSTAGINGDEPLOYS',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK = utils.createMockStep(
+    'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
+    'Commenting in StagingDeployCash',
+    'LOCKSTAGINGDEPLOYS',
+    [],
+    ['GITHUB_TOKEN'],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow',
+    'Announcing failed workflow in Slack',
+    'LOCKSTAGINGDEPLOYS',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS = [
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK,
+];
+
+module.exports = {
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/platformDeployMocks.js b/workflow_tests/mocks/platformDeployMocks.js
new file mode 100644
index 000000000000..9e0b91b29156
--- /dev/null
+++ b/workflow_tests/mocks/platformDeployMocks.js
@@ -0,0 +1,281 @@
+const utils = require('../utils/utils');
+
+// validateActor
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if the user is a deployer',
+    'VALIDATE_ACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if the user is a deployer',
+    'VALIDATE_ACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK];
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK];
+
+// deployChecklist
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DEPLOY_CHECKLIST');
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'DEPLOY_CHECKLIST');
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Set version', 'DEPLOY_CHECKLIST', [], [], {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CREATE_OR_UPDATE_STAGING_DEPLOY__STEP_MOCK = utils.createMockStep(
+    'Create or update staging deploy',
+    'Create or update staging deploy',
+    'DEPLOY_CHECKLIST',
+    ['GITHUB_TOKEN', 'NPM_VERSION'],
+);
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS = [
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CREATE_OR_UPDATE_STAGING_DEPLOY__STEP_MOCK,
+];
+
+// android
+const PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'ANDROID', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypting keystore', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypting JSON key', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version in ENV', 'Setting version in ENV', 'ANDROID', null, null, null, {VERSION_CODE: '1.2.3'});
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = utils.createMockStep('Run Fastlane beta', 'Running Fastlane beta', 'ANDROID', null, [
+    'MYAPP_UPLOAD_STORE_PASSWORD',
+    'MYAPP_UPLOAD_KEY_PASSWORD',
+]);
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = utils.createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']);
+const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
+const PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK = utils.createMockStep(
+    'Upload Android version to Browser Stack',
+    'Uploading Android version to Browser Stack',
+    'ANDROID',
+    null,
+    ['BROWSERSTACK'],
+);
+const PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK = utils.createMockStep(
+    'Warn deployers if Android production deploy failed',
+    'Warning deployers of failed production deploy',
+    'ANDROID',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__ANDROID__STEP_MOCKS = [
+    PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK,
+];
+
+// desktop
+const PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK = utils.createMockStep('Decrypt Developer ID Certificate', 'Decrypting developer id certificate', 'DESKTOP', null, [
+    'DEVELOPER_ID_SECRET_PASSPHRASE',
+]);
+const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build production desktop app', 'Building production desktop app', 'DESKTOP', null, [
+    'CSC_LINK',
+    'CSC_KEY_PASSWORD',
+    'APPLE_ID',
+    'APPLE_APP_SPECIFIC_PASSWORD',
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build staging desktop app', 'Building staging desktop app', 'DESKTOP', null, [
+    'CSC_LINK',
+    'CSC_KEY_PASSWORD',
+    'APPLE_ID',
+    'APPLE_APP_SPECIFIC_PASSWORD',
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS = [
+    PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK,
+];
+
+// ios
+const PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'IOS');
+const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+    'cache-hit': false,
+});
+const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep(
+    'Compare Podfile.lock and Manifest.lock',
+    'Compare Podfile.lock and Manifest.lock',
+    'IOS',
+    [],
+    [],
+    {IS_PODFILE_SAME_AS_MANIFEST: false},
+);
+const PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Installing cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt profile', 'Decrypting profile', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypting certificate', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK = utils.createMockStep('Decrypt App Store Connect API key', 'Decrypting App Store API key', 'IOS', null, [
+    'LARGE_SECRET_PASSPHRASE',
+]);
+const PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Running Fastlane', 'IOS', null, [
+    'APPLE_CONTACT_EMAIL',
+    'APPLE_CONTACT_PHONE',
+    'APPLE_DEMO_EMAIL',
+    'APPLE_DEMO_PASSWORD',
+]);
+const PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive iOS sourcemaps', 'Archiving sourcemaps', 'IOS', ['name', 'path']);
+const PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK = utils.createMockStep('Upload iOS version to Browser Stack', 'Uploading version to Browser Stack', 'IOS', null, ['BROWSERSTACK']);
+const PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set iOS version in ENV', 'Setting iOS version', 'IOS', null, null, null, {IOS_VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane for App Store release', 'Running Fastlane for release', 'IOS', null, ['VERSION']);
+const PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK = utils.createMockStep(
+    'Warn deployers if iOS production deploy failed',
+    'Warning developers of failed deploy',
+    'IOS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__IOS__STEP_MOCKS = [
+    PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_PROFILE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK,
+];
+
+// web
+const PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'WEB');
+const PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'WEB');
+const PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK = utils.createMockStep('Setup Cloudflare CLI', 'Setting up Cloudflare CLI', 'WEB');
+const PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep('Configure AWS Credentials', 'Configuring AWS credentials', 'WEB', [
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build web for production', 'Building web for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build web for staging', 'Building web for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK = utils.createMockStep('Build storybook docs for production', 'Build storybook docs for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK = utils.createMockStep('Build storybook docs for staging', 'Build storybook docs for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK = utils.createMockStep('Deploy production to S3', 'Deploying production to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK = utils.createMockStep('Deploy staging to S3', 'Deploying staging to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK = utils.createMockStep('Purge production Cloudflare cache', 'Purging production Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK = utils.createMockStep('Purge staging Cloudflare cache', 'Purging staging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
+    PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK,
+];
+
+// post slack message on failure
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK = utils.createMockStep('Post Slack message on failure', 'Posting Slack message on platform deploy failure', 'POST_SLACK_FAIL', [
+    'SLACK_WEBHOOK',
+]);
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS = [PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK];
+
+// post slack message on success
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_SLACK_SUCCESS');
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_SLACK_SUCCESS', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces the deploy in the #announce Slack room',
+    'Posting message to \\#announce channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces the deploy in the #deployer Slack room',
+    'Posting message to \\#deployer channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces a production deploy in the #expensify-open-source Slack room',
+    'Posting message to \\#expensify-open-source channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS = [
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK,
+];
+
+// post github comment
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_GITHUB_COMMENT', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = utils.createMockStep(
+    'Get Release Pull Request List',
+    'Getting release pull request list',
+    'POST_GITHUB_COMMENT',
+    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
+    null,
+    {PR_LIST: '[1.2.1, 1.2.2]'},
+);
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK = utils.createMockStep('Comment on issues', 'Commenting on issues', 'POST_GITHUB_COMMENT', [
+    'PR_LIST',
+    'IS_PRODUCTION_DEPLOY',
+    'DEPLOY_VERSION',
+    'GITHUB_TOKEN',
+    'ANDROID',
+    'DESKTOP',
+    'IOS',
+    'WEB',
+]);
+const PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS = [
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK,
+];
+
+module.exports = {
+    PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS,
+    PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+    PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+    PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+    PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+    PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/preDeployMocks.js b/workflow_tests/mocks/preDeployMocks.js
new file mode 100644
index 000000000000..3dc67a904cf9
--- /dev/null
+++ b/workflow_tests/mocks/preDeployMocks.js
@@ -0,0 +1,201 @@
+const utils = require('../utils/utils');
+
+// typecheck
+const TYPECHECK_WORKFLOW_MOCK_STEP = utils.createMockStep('Run typecheck workflow', 'Running typecheck workflow', 'TYPECHECK');
+const TYPECHECK_JOB_MOCK_STEPS = [TYPECHECK_WORKFLOW_MOCK_STEP];
+
+// lint
+const LINT_WORKFLOW_MOCK_STEP = utils.createMockStep('Run lint workflow', 'Running lint workflow', 'LINT');
+const LINT_JOB_MOCK_STEPS = [LINT_WORKFLOW_MOCK_STEP];
+
+// test
+const TEST_WORKFLOW_MOCK_STEP = utils.createMockStep('Run test workflow', 'Running test workflow', 'TEST');
+const TEST_JOB_MOCK_STEPS = [TEST_WORKFLOW_MOCK_STEP];
+
+// confirm_passing_build
+const ANNOUNCE_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in slack', 'CONFIRM_PASSING_BUILD', ['SLACK_WEBHOOK']);
+const CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS = [
+    ANNOUNCE_IN_SLACK_MOCK_STEP,
+
+    // 2nd step runs normally
+];
+
+// choose_deploy_actions
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY = utils.createMockStep('Get merged pull request', 'Getting merged pull request', 'CHOOSE_DEPLOY_ACTIONS', ['github_token'], null, {
+    number: '123',
+    labels: '[]',
+});
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED = utils.createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: true},
+);
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED = utils.createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: false},
+);
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED,
+
+    // step 3 runs normally
+];
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED,
+
+    // step 3 runs normally
+];
+
+// skip_deploy
+const COMMENT_ON_DEFERRED_PR_MOCK_STEP = utils.createMockStep('Comment on deferred PR', 'Skipping deploy', 'SKIP_DEPLOY', ['github_token', 'number', 'body']);
+const SKIP_DEPLOY_JOB_MOCK_STEPS = [COMMENT_ON_DEFERRED_PR_MOCK_STEP];
+
+// create_new_version
+const CREATE_NEW_VERSION_MOCK_STEP = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATE_NEW_VERSION',
+    null,
+    null,
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const CREATE_NEW_VERSION_JOB_MOCK_STEPS = [CREATE_NEW_VERSION_MOCK_STEP];
+
+// update_staging
+const RUN_TURNSTYLE_MOCK_STEP = utils.createMockStep('Run turnstyle', 'Running turnstyle', 'UPDATE_STAGING', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CHECKOUT_MAIN_MOCK_STEP = utils.createMockStep('Checkout main', 'Checkout main', 'UPDATE_STAGING', ['ref', 'token']);
+const SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP = utils.createMockStep('Setup Git for OSBotify', 'Setup Git for OSBotify', 'UPDATE_STAGING', ['GPG_PASSPHRASE']);
+const UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP = utils.createMockStep('Update staging branch from main', 'Update staging branch from main', 'UPDATE_STAGING');
+const ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in Slack', 'UPDATE_STAGING', ['SLACK_WEBHOOK']);
+const UPDATE_STAGING_JOB_MOCK_STEPS = [
+    RUN_TURNSTYLE_MOCK_STEP,
+    CHECKOUT_MAIN_MOCK_STEP,
+    SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP,
+    UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP,
+    ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP,
+];
+
+// is_expensify_employee
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'IS_EXPENSIFY_EMPLOYEE',
+    ['github_token'],
+    null,
+    {author: 'Dummy Author'},
+);
+const CHECK_TEAM_MEMBERSHIP_MOCK_STEP__TRUE = utils.createMockStep(
+    'Check whether the PR author is member of Expensify/expensify team',
+    'Checking actors Expensify membership',
+    'IS_EXPENSIFY_EMPLOYEE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_EXPENSIFY_EMPLOYEE: true},
+);
+const IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE = [GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE, CHECK_TEAM_MEMBERSHIP_MOCK_STEP__TRUE];
+const CHECK_TEAM_MEMBERSHIP_MOCK_STEP__FALSE = utils.createMockStep(
+    'Check whether the PR author is member of Expensify/expensify team',
+    'Checking actors Expensify membership',
+    'IS_EXPENSIFY_EMPLOYEE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_EXPENSIFY_EMPLOYEE: false},
+);
+const IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE = [GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE, CHECK_TEAM_MEMBERSHIP_MOCK_STEP__FALSE];
+
+// new_contributor_welcome_message
+const CHECKOUT_MOCK_STEP = utils.createMockStep('Checkout', 'Checking out', 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', ['token'], null, {author: 'Dummy Author'});
+const CHECKOUT_MOCK_STEP__OSBOTIFY = utils.createMockStep('Checkout', 'Checking out', 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', ['token'], null, {author: 'OSBotify'});
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token'],
+    null,
+    {number: '12345', author: 'Dummy Author'},
+);
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE__OSBOTIFY = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token'],
+    null,
+    {number: '12345', author: 'OSBotify'},
+);
+const GET_PR_COUNT_MOCK_STEP__1 = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    'Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}',
+    'Getting PR count',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    null,
+    ['GITHUB_TOKEN'],
+    null,
+    {PR_COUNT: '1'},
+);
+const GET_PR_COUNT_MOCK_STEP__10 = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    'Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}',
+    'Getting PR count',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    null,
+    ['GITHUB_TOKEN'],
+    null,
+    {PR_COUNT: '10'},
+);
+const COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    "Comment on ${{ steps.getMergedPullRequest.outputs.author }}\\'s first pull request!",
+    'Creating comment',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token', 'number', 'body'],
+);
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS = [
+    CHECKOUT_MOCK_STEP,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE,
+    GET_PR_COUNT_MOCK_STEP__10,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR = [
+    CHECKOUT_MOCK_STEP,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE,
+    GET_PR_COUNT_MOCK_STEP__1,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY = [
+    CHECKOUT_MOCK_STEP__OSBOTIFY,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE__OSBOTIFY,
+    GET_PR_COUNT_MOCK_STEP__10,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+
+const PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP = utils.createMockStep('Perform E2E tests', 'Perform E2E tests', 'E2EPERFORMANCETESTS');
+const PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS = [PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP];
+
+module.exports = {
+    TYPECHECK_JOB_MOCK_STEPS,
+    LINT_JOB_MOCK_STEPS,
+    TEST_JOB_MOCK_STEPS,
+    CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+    SKIP_DEPLOY_JOB_MOCK_STEPS,
+    CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+    UPDATE_STAGING_JOB_MOCK_STEPS,
+    IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+    IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+    PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+};
diff --git a/workflow_tests/mocks/reviewerChecklistMocks.js b/workflow_tests/mocks/reviewerChecklistMocks.js
new file mode 100644
index 000000000000..5f9ef67198a8
--- /dev/null
+++ b/workflow_tests/mocks/reviewerChecklistMocks.js
@@ -0,0 +1,9 @@
+const utils = require('../utils/utils');
+
+// checklist
+const REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK = utils.createMockStep('reviewerChecklist.js', 'reviewerChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS = [REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK];
+
+module.exports = {
+    REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/testBuildMocks.js b/workflow_tests/mocks/testBuildMocks.js
new file mode 100644
index 000000000000..bdff0ac57ae1
--- /dev/null
+++ b/workflow_tests/mocks/testBuildMocks.js
@@ -0,0 +1,263 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    IS_EXPENSIFY_EMPLOYEE: true,
+});
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    IS_EXPENSIFY_EMPLOYEE: false,
+});
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK = utils.createMockStep(
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'VALIDATEACTOR',
+    [],
+    ['PULL_REQUEST_NUMBER', 'GITHUB_TOKEN'],
+    {HAS_READY_TO_BUILD_LABEL: true},
+);
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK = utils.createMockStep(
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'VALIDATEACTOR',
+    [],
+    ['PULL_REQUEST_NUMBER', 'GITHUB_TOKEN'],
+    {HAS_READY_TO_BUILD_LABEL: false},
+);
+const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
+];
+
+// getbranchref
+const TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'GETBRANCHREF', [], []);
+const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK = utils.createMockStep(
+    'Check if pull request number is correct',
+    'Check if pull request number is correct',
+    'GETBRANCHREF',
+    [],
+    ['GITHUB_TOKEN'],
+    {REF: 'test-ref'},
+);
+const TESTBUILD__GETBRANCHREF__STEP_MOCKS = [TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK, TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK];
+
+// android
+const TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'ANDROID', ['ref'], []);
+const TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'ANDROID',
+    [],
+    [],
+);
+const TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'ANDROID', [], []);
+const TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'ANDROID', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypt json key', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'ANDROID',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK = utils.createMockStep(
+    'Run Fastlane beta test',
+    'Run Fastlane beta test',
+    'ANDROID',
+    [],
+    ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION', 'MYAPP_UPLOAD_STORE_PASSWORD', 'MYAPP_UPLOAD_KEY_PASSWORD'],
+);
+const TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'ANDROID', ['name', 'path'], []);
+const TESTBUILD__ANDROID__STEP_MOCKS = [
+    TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK,
+    TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK,
+    TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK,
+    TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK,
+    TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK,
+    TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK,
+];
+
+// ios
+const TESTBUILD__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'IOS', ['ref'], []);
+const TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'IOS',
+    [],
+    [],
+);
+const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = utils.createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+    'cache-hit': false,
+});
+const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
+    IS_PODFILE_SAME_AS_MANIFEST: false,
+});
+const TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], []);
+const TESTBUILD__IOS__DECRYPT_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt profile', 'Decrypt profile', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypt certificate', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'IOS',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Run Fastlane', 'IOS', [], ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION']);
+const TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'IOS', ['name', 'path'], []);
+const TESTBUILD__IOS__STEP_MOCKS = [
+    TESTBUILD__IOS__CHECKOUT__STEP_MOCK,
+    TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK,
+    TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK,
+    TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK,
+    TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK,
+    TESTBUILD__IOS__DECRYPT_PROFILE__STEP_MOCK,
+    TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK,
+    TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK,
+    TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK,
+];
+
+// desktop
+const TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DESKTOP', ['ref'], []);
+const TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'DESKTOP',
+    [],
+    [],
+);
+const TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'DESKTOP', [], []);
+const TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK = utils.createMockStep(
+    'Decrypt Developer ID Certificate',
+    'Decrypt Developer ID Certificate',
+    'DESKTOP',
+    [],
+    ['DEVELOPER_ID_SECRET_PASSPHRASE'],
+);
+const TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'DESKTOP',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK = utils.createMockStep(
+    'Build desktop app for testing',
+    'Build desktop app for testing',
+    'DESKTOP',
+    [],
+    ['CSC_LINK', 'CSC_KEY_PASSWORD', 'APPLE_ID', 'APPLE_APP_SPECIFIC_PASSWORD', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+);
+const TESTBUILD__DESKTOP__STEP_MOCKS = [
+    TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK,
+    TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK,
+    TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK,
+];
+
+// web
+const TESTBUILD__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'WEB', ['ref'], []);
+const TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'WEB',
+    [],
+    [],
+);
+const TESTBUILD__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'WEB', [], []);
+const TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'WEB',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK = utils.createMockStep('Build web for testing', 'Build web for testing', 'WEB', [], []);
+const TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK = utils.createMockStep('Build docs', 'Build docs', 'WEB', [], []);
+const TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK = utils.createMockStep('Deploy to S3 for internal testing', 'Deploy to S3 for internal testing', 'WEB', [], []);
+const TESTBUILD__WEB__STEP_MOCKS = [
+    TESTBUILD__WEB__CHECKOUT__STEP_MOCK,
+    TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__WEB__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK,
+    TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK,
+    TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK,
+];
+
+// postgithubcomment
+const TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'POSTGITHUBCOMMENT', ['ref'], []);
+const TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Download Artifact', 'Download Artifact', 'POSTGITHUBCOMMENT', [], []);
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK = utils.createMockStep(
+    'Read JSONs with android paths',
+    'Read JSONs with android paths',
+    'POSTGITHUBCOMMENT',
+    [],
+    [],
+    {android_path: 'http://dummy.android.link'},
+);
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK = utils.createMockStep('Read JSONs with iOS paths', 'Read JSONs with iOS paths', 'POSTGITHUBCOMMENT', [], [], {
+    ios_path: 'http://dummy.ios.link',
+});
+const TESTBUILD__POSTGITHUBCOMMENT__MAINTAIN_COMMENT__STEP_MOCK = utils.createMockStep(
+    'maintain-comment',
+    'maintain-comment',
+    'POSTGITHUBCOMMENT',
+    ['token', 'body-include', 'number', 'delete'],
+    [],
+);
+const TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK = utils.createMockStep(
+    'Publish links to apps for download',
+    'Publish links to apps for download',
+    'POSTGITHUBCOMMENT',
+    ['PR_NUMBER', 'GITHUB_TOKEN', 'ANDROID', 'DESKTOP', 'IOS', 'WEB', 'ANDROID_LINK', 'DESKTOP_LINK', 'IOS_LINK', 'WEB_LINK'],
+    [],
+);
+const TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS = [
+    TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__MAINTAIN_COMMENT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK,
+];
+
+module.exports = {
+    TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+    TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+    TESTBUILD__ANDROID__STEP_MOCKS,
+    TESTBUILD__IOS__STEP_MOCKS,
+    TESTBUILD__DESKTOP__STEP_MOCKS,
+    TESTBUILD__WEB__STEP_MOCKS,
+    TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/testMocks.js b/workflow_tests/mocks/testMocks.js
new file mode 100644
index 000000000000..19011271bb47
--- /dev/null
+++ b/workflow_tests/mocks/testMocks.js
@@ -0,0 +1,26 @@
+const utils = require('../utils/utils');
+
+// jest
+const TEST__JEST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'JEST', [], []);
+const TEST__JEST__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'JEST', [], []);
+const TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK = utils.createMockStep('Get number of CPU cores', 'Get number of CPU cores', 'JEST', [], [], {count: 8});
+const TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK = utils.createMockStep('Cache Jest cache', 'Cache Jest cache', 'JEST', ['path', 'key'], []);
+const TEST__JEST__JEST_TESTS__STEP_MOCK = utils.createMockStep('Jest tests', 'Jest tests', 'JEST', [], []);
+const TEST__JEST__STEP_MOCKS = [
+    TEST__JEST__CHECKOUT__STEP_MOCK,
+    TEST__JEST__SETUP_NODE__STEP_MOCK,
+    TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK,
+    TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK,
+    TEST__JEST__JEST_TESTS__STEP_MOCK,
+];
+
+// shelltests
+const TEST__SHELLTESTS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK = utils.createMockStep('Test CI git logic', 'Test CI git logic', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__STEP_MOCKS = [TEST__SHELLTESTS__CHECKOUT__STEP_MOCK, TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK, TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK];
+
+module.exports = {
+    TEST__JEST__STEP_MOCKS,
+    TEST__SHELLTESTS__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/validateGithubActionsMocks.js b/workflow_tests/mocks/validateGithubActionsMocks.js
new file mode 100644
index 000000000000..e2d48932acf6
--- /dev/null
+++ b/workflow_tests/mocks/validateGithubActionsMocks.js
@@ -0,0 +1,23 @@
+const utils = require('../utils/utils');
+
+// verify
+const VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK = utils.createMockStep(
+    'Verify Javascript Action Builds',
+    'Verify Javascript Action Builds',
+    'VERIFY',
+    [],
+    [],
+);
+const VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK = utils.createMockStep('Validate actions and workflows', 'Validate actions and workflows', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS = [
+    VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK,
+];
+
+module.exports = {
+    VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifyPodfileMocks.js b/workflow_tests/mocks/verifyPodfileMocks.js
new file mode 100644
index 000000000000..0a82eebcc748
--- /dev/null
+++ b/workflow_tests/mocks/verifyPodfileMocks.js
@@ -0,0 +1,11 @@
+const utils = require('../utils/utils');
+
+// verify
+const VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK = utils.createMockStep('Verify podfile', 'Verify podfile', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__STEP_MOCKS = [VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK, VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK, VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK];
+
+module.exports = {
+    VERIFYPODFILE__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifySignedCommitsMocks.js b/workflow_tests/mocks/verifySignedCommitsMocks.js
new file mode 100644
index 000000000000..a19fac809e55
--- /dev/null
+++ b/workflow_tests/mocks/verifySignedCommitsMocks.js
@@ -0,0 +1,15 @@
+const utils = require('../utils/utils');
+
+// verifysignedcommits
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK = utils.createMockStep(
+    'Verify signed commits',
+    'Verify signed commits',
+    'VERIFYSIGNEDCOMMITS',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS = [VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK];
+
+module.exports = {
+    VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+};
diff --git a/workflow_tests/platformDeploy.test.js b/workflow_tests/platformDeploy.test.js
new file mode 100644
index 000000000000..e74b8e873001
--- /dev/null
+++ b/workflow_tests/platformDeploy.test.js
@@ -0,0 +1,273 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'platformDeploy.yml'),
+        dest: '.github/workflows/platformDeploy.yml',
+    },
+];
+
+describe('test workflow platformDeploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testPlatformDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: [],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('push', () => {
+        describe('tag', () => {
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'Dummy Author');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, true, false, true);
+                assertions.assertDesktopJobExecuted(result, true, false);
+                assertions.assertIOSJobExecuted(result, true, false, true);
+                assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false);
+            });
+
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'OSBotify');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, true, false, true);
+                assertions.assertDesktopJobExecuted(result, true, false);
+                assertions.assertIOSJobExecuted(result, true, false, true);
+                assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false);
+            });
+
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'Dummy Author');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, false);
+                assertions.assertDesktopJobExecuted(result, false);
+                assertions.assertIOSJobExecuted(result, false);
+                assertions.assertWebJobExecuted(result, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/preDeploy.test.js b/workflow_tests/preDeploy.test.js
new file mode 100644
index 000000000000..4a4d9dcc82bb
--- /dev/null
+++ b/workflow_tests/preDeploy.test.js
@@ -0,0 +1,1087 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'preDeploy.yml'),
+        dest: '.github/workflows/preDeploy.yml',
+    },
+];
+
+describe('test workflow preDeploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testPreDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: ['different_branch'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    it('push to main - workflow executes', async () => {
+        // get path to the local test repo
+        const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+
+        // get path to the workflow file under test
+        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);
+
+        // set run parameters
+        act = utils.setUpActParams(
+            act,
+            'push',
+            {ref: 'refs/heads/main'},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+
+        // set up mocks
+        const testMockSteps = {
+            confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+            chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+            skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+            updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+            isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+            newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+        };
+        const testMockJobs = {
+            typecheck: {
+                steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            lint: {
+                steps: mocks.LINT_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            test: {
+                steps: mocks.TEST_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            createNewVersion: {
+                steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                outputs: {
+                    // eslint-disable-next-line no-template-curly-in-string
+                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                },
+                runsOn: 'ubuntu-latest',
+            },
+            e2ePerformanceTests: {
+                steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+        };
+
+        // run an event and get the result
+        const result = await act.runEvent('push', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+
+        // assert results (some steps can run in parallel to each other so the order is not assured
+        // therefore we can check which steps have been executed, but not the set job order
+        assertions.assertTypecheckJobExecuted(result);
+        assertions.assertLintJobExecuted(result);
+        assertions.assertTestJobExecuted(result);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result);
+        assertions.assertChooseDeployActionsJobExecuted(result);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result);
+        assertions.assertUpdateStagingJobExecuted(result);
+    });
+
+    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);
+        const testMockSteps = {
+            confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+            chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+            skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+            updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+            isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+            newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+        };
+        const testMockJobs = {
+            typecheck: {
+                steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            lint: {
+                steps: mocks.LINT_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            test: {
+                steps: mocks.TEST_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            createNewVersion: {
+                steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                outputs: {
+                    // eslint-disable-next-line no-template-curly-in-string
+                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                },
+                runsOn: 'ubuntu-latest',
+            },
+            e2ePerformanceTests: {
+                steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+        };
+
+        // pull_request
+        act = utils.setUpActParams(
+            act,
+            'pull_request',
+            {head: {ref: 'main'}},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        let result = await act.runEvent('pull_request', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+        assertions.assertTypecheckJobExecuted(result, false);
+        assertions.assertLintJobExecuted(result, false);
+        assertions.assertTestJobExecuted(result, false);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result, false);
+        assertions.assertChooseDeployActionsJobExecuted(result, false);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result, false);
+        assertions.assertUpdateStagingJobExecuted(result, false);
+
+        // workflow_dispatch
+        act = utils.setUpActParams(
+            act,
+            'workflow_dispatch',
+            {},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        result = await act.runEvent('workflow_dispatch', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+        assertions.assertTypecheckJobExecuted(result, false);
+        assertions.assertLintJobExecuted(result, false);
+        assertions.assertTestJobExecuted(result, false);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result, false);
+        assertions.assertChooseDeployActionsJobExecuted(result, false);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result, false);
+        assertions.assertUpdateStagingJobExecuted(result, false);
+    });
+
+    describe('confirm passing build', () => {
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: [utils.createMockStep('Run typecheck workflow', 'Running typecheck workflow - Typecheck workflow failed', 'TYPECHECK', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            expect(result).toEqual(
+                expect.arrayContaining([utils.createStepAssertion('Run typecheck workflow', false, null, 'TYPECHECK', 'Running typecheck workflow - Typecheck workflow failed')]),
+            );
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: [utils.createMockStep('Run lint workflow', 'Running lint workflow - Lint workflow failed', 'LINT', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            expect(result).toEqual(expect.arrayContaining([utils.createStepAssertion('Run lint workflow', false, null, 'LINT', 'Running lint workflow - Lint workflow failed')]));
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: [utils.createMockStep('Run test workflow', 'Running test workflow - Test workflow failed', 'TEST', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            expect(result).toEqual(expect.arrayContaining([utils.createStepAssertion('Run test workflow', false, null, 'TEST', 'Running test workflow - Test workflow failed')]));
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result);
+            assertions.assertUpdateStagingJobExecuted(result);
+        });
+    });
+
+    describe('new contributor welcome message', () => {
+        it('actor is OSBotify - 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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, false);
+        });
+
+        it('actor is Expensify employee - 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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, false);
+        });
+
+        it('actor is not Expensify employee, its not their first PR - job triggers, 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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, true, false, false);
+        });
+
+        it('actor is not Expensify employee, and its their first PR - job triggers 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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, true, false, true);
+        });
+    });
+
+    describe('choose deploy actions', () => {
+        describe('staging locked', () => {
+            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);
+                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,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Tester',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+
+            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);
+                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,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+        });
+
+        describe('staging not locked', () => {
+            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);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {ref: 'refs/heads/main'},
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                    },
+                    'dummy_github_token',
+                );
+                const testMockSteps = {
+                    confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Tester',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result);
+                assertions.assertUpdateStagingJobExecuted(result, true);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+
+            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);
+                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,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+        });
+
+        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);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            testMockSteps.updateStaging[3].mockWith = 'exit 1';
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result);
+            assertions.assertUpdateStagingJobFailed(result, true);
+        });
+    });
+});
diff --git a/workflow_tests/reviewerChecklist.test.js b/workflow_tests/reviewerChecklist.test.js
new file mode 100644
index 000000000000..9903c3eb4b8d
--- /dev/null
+++ b/workflow_tests/reviewerChecklist.test.js
@@ -0,0 +1,84 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'reviewerChecklist.yml'),
+        dest: '.github/workflows/reviewerChecklist.yml',
+    },
+];
+
+describe('test workflow reviewerChecklist', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testReviewerChecklistWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is pull_request_review', () => {
+        const event = 'pull_request_review';
+        const eventOptions = {};
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('reviewerChecklist', expect.getState().currentTestName),
+            });
+
+            assertions.assertChecklistJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            const osbotifyActor = 'OSBotify';
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('reviewerChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/scripts/runWorkflowTests.sh b/workflow_tests/scripts/runWorkflowTests.sh
new file mode 100755
index 000000000000..71ddcdceffb5
--- /dev/null
+++ b/workflow_tests/scripts/runWorkflowTests.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+source ./scripts/shellUtils.sh
+
+title 'GitHub Actions workflow tests'
+printf '\n'
+
+# Check setup
+info 'Checking environment setup'
+
+# Check if docker is installed
+if ! docker --version > /dev/null 2>&1; then
+  error 'Docker is not installed'
+  info 'Act requires docker to be installed. Please install docker and try again'
+  exit 1
+fi
+info 'Docker installed'
+
+# Check if docker is running
+if ! docker info > /dev/null 2>&1; then
+  error 'Docker is not running'
+  info 'Act requires docker engine to be running. Enable docker engine and try again'
+  exit 1
+fi
+info 'Docker engine running'
+
+# Check if act is installed
+if ! act --version > /dev/null 2>&1; then
+  error 'Act not installed'
+  info 'Install Act with brew install act and follow the documentation on first Act run (https://github.com/nektos/act#first-act-run)'
+  exit 1
+fi
+info 'Act installed'
+
+# Check if ACT_BINARY is set
+if [[ -z ${ACT_BINARY} ]]; then
+  info 'ACT_BINARY not set, checking .env file'
+  if [ -f .env ]; then
+    set -a
+    source .env
+    set +a
+  else
+    info '.env file does not exist'
+  fi
+  if [[ -z ${ACT_BINARY} ]]; then
+    error 'ACT_BINARY variable not set'
+    info 'To make sure Act behaves in a predictable manner please set the ACT_BINARY environment variable to the path to your Act binary'
+    exit 1
+  fi
+fi
+info 'ACT_BINARY environment variable set'
+
+if ! eval '${ACT_BINARY} --version' > /dev/null 2>&1; then
+  error 'ACT_BINARY variable not set properly'
+  info 'ACT_BINARY environment variable should be set to the path to your Act executable. Please set the variable correctly (try running "which act" to check the path)'
+  exit 1
+fi
+info 'ACT_BINARY environment variable set to an Act executable'
+
+success 'Environment setup properly - running tests'
+
+# Run tests
+npm test -- --config=workflow_tests/jest.config.js --runInBand "$@"
diff --git a/workflow_tests/test.test.js b/workflow_tests/test.test.js
new file mode 100644
index 000000000000..6efe8d260928
--- /dev/null
+++ b/workflow_tests/test.test.js
@@ -0,0 +1,184 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'test.yml'),
+        dest: '.github/workflows/test.yml',
+    },
+];
+
+describe('test workflow test', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const osbotifyActor = 'OSBotify';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testTestWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result, false);
+                assertions.assertShellTestsJobExecuted(result, false);
+            });
+        });
+    });
+
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result, false);
+                assertions.assertShellTestsJobExecuted(result, false);
+            });
+        });
+    });
+
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const eventOptions = {};
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result);
+                assertions.assertShellTestsJobExecuted(result);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/testBuild.test.js b/workflow_tests/testBuild.test.js
new file mode 100644
index 000000000000..4288ea236ab2
--- /dev/null
+++ b/workflow_tests/testBuild.test.js
@@ -0,0 +1,753 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'testBuild.yml'),
+        dest: '.github/workflows/testBuild.yml',
+    },
+];
+
+describe('test workflow testBuild', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const secrets = {
+        OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+        AWS_ACCESS_KEY_ID: 'dummy_aws_access_kry_id',
+        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_developer_id_secret_passphrase',
+        CSC_LINK: 'dummy_csc_link',
+        CSC_KEY_PASSWORD: 'dummy_csc_key_password',
+        APPLE_ID_PASSWORD: 'dummy_apple_id_password',
+        APPLE_ID: 'dummy_apple_id_value',
+        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_myapp_upload_store_password',
+        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_myapp_upload_key_password',
+    };
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testTestBuildWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is workflow_dispatch', () => {
+        const event = 'workflow_dispatch';
+        const inputs = {
+            PULL_REQUEST_NUMBER: '1234',
+        };
+        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);
+            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 = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('android fails', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: utils.deepCopy(mocks.TESTBUILD__ANDROID__STEP_MOCKS),
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.android[4] = utils.createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE'], {}, {}, false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', true, 4);
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'failure', 'success', 'success', 'success');
+            });
+        });
+        describe('iOS fails', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: utils.deepCopy(mocks.TESTBUILD__IOS__STEP_MOCKS),
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.iOS[8] = utils.createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], [], {}, {}, false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref', true, 8);
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'failure', 'success', 'success');
+            });
+        });
+        describe('desktop fails', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: utils.deepCopy(mocks.TESTBUILD__DESKTOP__STEP_MOCKS),
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.desktop[3] = utils.createMockStep(
+                    'Decrypt Developer ID Certificate',
+                    'Decrypt Developer ID Certificate',
+                    'DESKTOP',
+                    [],
+                    ['DEVELOPER_ID_SECRET_PASSPHRASE'],
+                    {},
+                    {},
+                    false,
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref', true, 3);
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'success', 'failure', 'success');
+            });
+        });
+        describe('web fails', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: utils.deepCopy(mocks.TESTBUILD__WEB__STEP_MOCKS),
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.web[3] = utils.createMockStep(
+                    'Configure AWS Credentials',
+                    'Configure AWS Credentials',
+                    'WEB',
+                    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+                    [],
+                    {},
+                    {},
+                    false,
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref', true, 3);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'success', 'success', 'failure');
+            });
+        });
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'opened',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        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);
+            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 = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'synchronize',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        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);
+            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 = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+    describe('pull request labeled', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'labeled',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        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);
+            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 = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            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);
+                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 = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/utils/ExtendedAct.js b/workflow_tests/utils/ExtendedAct.js
new file mode 100644
index 000000000000..9b4ab1bebda2
--- /dev/null
+++ b/workflow_tests/utils/ExtendedAct.js
@@ -0,0 +1,44 @@
+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/JobMocker.js b/workflow_tests/utils/JobMocker.js
new file mode 100644
index 000000000000..a2682a657380
--- /dev/null
+++ b/workflow_tests/utils/JobMocker.js
@@ -0,0 +1,83 @@
+const fs = require('fs');
+const path = require('path');
+const yaml = require('yaml');
+const _ = require('underscore');
+
+class JobMocker {
+    constructor(workflowFile, cwd) {
+        this.workflowFile = workflowFile;
+        this.cwd = cwd;
+    }
+
+    async mock(mockJobs) {
+        const filePath = this.getWorkflowPath();
+        const workflow = await this.readWorkflowFile(filePath);
+        Object.entries(mockJobs).forEach(([jobId, mockJob]) => {
+            const job = this.locateJob(workflow, jobId);
+            if (job) {
+                if (job.uses) {
+                    delete job.uses;
+                }
+                if (job.secrets) {
+                    delete job.secrets;
+                }
+                let jobWith;
+                if (job.with) {
+                    jobWith = job.with;
+                    delete job.with;
+                }
+                job.steps = _(mockJob.steps).map((step) => {
+                    const mockStep = {
+                        name: step.name,
+                        run: step.mockWith,
+                    };
+                    if (step.id) {
+                        mockStep.id = step.id;
+                    }
+                    if (jobWith) {
+                        mockStep.with = jobWith;
+                    }
+                    return mockStep;
+                });
+                if (mockJob.outputs) {
+                    job.outputs = mockJob.outputs;
+                }
+                if (mockJob.runsOn) {
+                    job['runs-on'] = mockJob.runsOn;
+                }
+            } else {
+                throw new Error('Could not find job');
+            }
+        });
+        return this.writeWorkflowFile(filePath, workflow);
+    }
+
+    locateJob(workflow, jobId) {
+        return workflow.jobs[jobId];
+    }
+
+    getWorkflowPath() {
+        if (fs.existsSync(path.join(this.cwd, this.workflowFile))) {
+            return path.join(this.cwd, this.workflowFile);
+        }
+        if (this.cwd.endsWith('.github')) {
+            return path.join(this.cwd, 'workflows', this.workflowFile);
+        }
+        if (fs.existsSync(path.join(this.cwd, '.github', 'workflows', this.workflowFile))) {
+            return path.join(this.cwd, '.github', 'workflows', this.workflowFile);
+        }
+        throw new Error(`Could not locate ${this.workflowFile}`);
+    }
+
+    async readWorkflowFile(location) {
+        return yaml.parse(fs.readFileSync(location, 'utf8'));
+    }
+
+    async writeWorkflowFile(location, data) {
+        return fs.writeFileSync(location, yaml.stringify(data), 'utf8');
+    }
+}
+
+module.exports = {
+    JobMocker,
+};
diff --git a/workflow_tests/utils/preGenerateTest.js b/workflow_tests/utils/preGenerateTest.js
new file mode 100644
index 000000000000..4ed485abec40
--- /dev/null
+++ b/workflow_tests/utils/preGenerateTest.js
@@ -0,0 +1,281 @@
+/* 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');
+
+const workflowsDirectory = path.resolve(__dirname, '..', '..', '.github', 'workflows');
+const workflowTestsDirectory = path.resolve(__dirname, '..');
+const workflowTestMocksDirectory = path.join(workflowTestsDirectory, 'mocks');
+const workflowTestAssertionsDirectory = path.join(workflowTestsDirectory, 'assertions');
+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');
+${mockSteps}
+${exports}
+`;
+const assertionFileTemplate = (jobAssertions, exports) => `const utils = require('../utils/utils');
+${jobAssertions}
+${exports}
+`;
+const testFileTemplate = (workflowName) => `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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '${workflowName}.yml'),
+        dest: '.github/workflows/${workflowName}.yml',
+    },
+];
+
+describe('test workflow ${workflowName}', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                test${capitalize(workflowName)}WorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+    
+        await mockGithub.setup();
+    });
+    
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    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);
+        act = utils.setUpActParams(
+            act,
+            '[EVENT]',
+            {},
+            {},
+            githubToken,
+        );
+        const testMockSteps = {
+            // mock steps with imported mocks
+        };
+        const result = await act
+            .runEvent('[EVENT]', {
+                workflowFile: path.join(repoPath, '.github', 'workflows'),
+                mockSteps: testMockSteps,
+                actor,
+            });
+            
+        // assert execution with imported assertions
+    });
+});
+`;
+const mockStepTemplate = (stepMockName, step, jobId) => `
+const ${stepMockName} = utils.getMockStep(
+    '${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) => `
+        utils.getStepAssertion(
+            '${step_name}',
+            true,
+            null,
+            '${job_id}',
+            '${step_message}',
+            [${_(inputs).map((input) => `{key: '${input}', value: '[FILL_IN]'}`)}],
+            [${_(envs).map((env) => `{key: '${env}', value: '[FILL_IN]'}`)}],
+        ),`;
+const jobMocksTemplate = (jobMocksName, stepMocks) => `
+const ${jobMocksName} = [${_(stepMocks).map(
+    (stepMock) => `
+    ${stepMock}`,
+)}
+];`;
+const jobAssertionTemplate = (jobAssertionName, stepAssertions) => `
+const ${jobAssertionName} = (workflowResult, didExecute = true) => {
+    const steps = [${stepAssertions}
+    ];
+
+    for (const expectedStep of steps) {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    }
+};`;
+const mocksExportsTemplate = (jobMocks) => `
+module.exports = {
+    ${_(jobMocks).map((jobMock) => `${jobMock}`)}
+};`;
+const assertionsExportsTemplate = (jobAssertions) => `
+module.exports = {
+    ${_(jobAssertions).map((jobAssertion) => `${jobAssertion}`)}
+};`;
+
+const checkArguments = (args) => {
+    if (args.length > 0 && args[0]) {
+        return;
+    }
+    console.warn('Please provide workflow file name');
+    exit(1);
+};
+const checkWorkflowFileName = (fileName) => {
+    if (workflowFileRegex.test(fileName)) {
+        return;
+    }
+    console.warn(`Please provide a valid workflow file name ([workflow].yml) instead of ${fileName}`);
+    exit(1);
+};
+const checkWorkflowFilePath = (filePath) => {
+    if (fs.existsSync(filePath)) {
+        return;
+    }
+    console.warn(`Provided workflow file does not exist: ${filePath}`);
+    exit(1);
+};
+const checkIfTestFileExists = (testsDirectory, testFileName) => {
+    if (!fs.existsSync(path.join(testsDirectory, testFileName))) {
+        return;
+    }
+    console.warn(`The test file ${testFileName} already exists, exiting`);
+    exit(1);
+};
+const checkIfMocksFileExists = (mocksDirectory, mocksFileName) => {
+    if (!fs.existsSync(path.join(mocksDirectory, mocksFileName))) {
+        return;
+    }
+    console.warn(`The mocks file ${mocksFileName} already exists, exiting`);
+    exit(1);
+};
+const checkIfAssertionsFileExists = (assertionsDirectory, assertionsFileName) => {
+    if (!fs.existsSync(path.join(assertionsDirectory, assertionsFileName))) {
+        return;
+    }
+    console.warn(`The assertions file ${assertionsFileName} already exists, exiting`);
+    exit(1);
+};
+const parseWorkflowFile = (workflow) => {
+    const workflowJobs = {};
+    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 || {}) || [],
+            };
+            workflowJobs[jobId].steps.push(workflowStep);
+        });
+    });
+    return workflowJobs;
+};
+const getMockFileContent = (workflowName, jobs) => {
+    let content = '';
+    const jobMocks = [];
+    Object.entries(jobs).forEach(([jobId, job]) => {
+        let mockStepsContent = `\n// ${jobId.toLowerCase()}`;
+        const stepMocks = [];
+        job.steps.forEach((step) => {
+            const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${step.name
+                .replaceAll(' ', '_')
+                .replaceAll('-', '_')
+                .replaceAll(',', '')
+                .replaceAll('#', '')
+                .toUpperCase()}__STEP_MOCK`;
+            stepMocks.push(stepMockName);
+            mockStepsContent += mockStepTemplate(stepMockName, step, jobId);
+        });
+        const jobMocksName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__STEP_MOCKS`;
+        jobMocks.push(jobMocksName);
+        mockStepsContent += jobMocksTemplate(jobMocksName, stepMocks);
+        content += mockStepsContent;
+    });
+    return mockFileTemplate(content, mocksExportsTemplate(jobMocks));
+};
+const getAssertionsFileContent = (workflowName, jobs) => {
+    let content = '';
+    const jobAssertions = [];
+    Object.entries(jobs).forEach(([jobId, job]) => {
+        let stepAssertionsContent = '';
+        job.steps.forEach((step) => {
+            stepAssertionsContent += stepAssertionTemplate(step.name, jobId.toUpperCase(), step.name, step.inputs, step.envs);
+        });
+        const jobAssertionName = `assert${jobId.charAt(0).toUpperCase() + jobId.slice(1)}JobExecuted`;
+        jobAssertions.push(jobAssertionName);
+        content += jobAssertionTemplate(jobAssertionName, stepAssertionsContent);
+    });
+    return assertionFileTemplate(content, assertionsExportsTemplate(jobAssertions));
+};
+const getTestFileContent = (workflowName) => testFileTemplate(workflowName);
+
+const call_args = process.argv.slice(2);
+checkArguments(call_args);
+
+const workflowFileName = call_args[0];
+checkWorkflowFileName(workflowFileName);
+
+const workflowName = workflowFileName.slice(0, -4);
+const workflowFilePath = path.join(workflowsDirectory, workflowFileName);
+checkWorkflowFilePath(workflowFilePath);
+
+const workflowTestFileName = `${workflowName}.test.js`;
+checkIfTestFileExists(workflowTestsDirectory, workflowTestFileName);
+
+const workflowTestMocksFileName = `${workflowName}Mocks.js`;
+checkIfMocksFileExists(workflowTestMocksDirectory, workflowTestMocksFileName);
+
+const workflowTestAssertionsFileName = `${workflowName}Assertions.js`;
+checkIfAssertionsFileExists(workflowTestAssertionsDirectory, workflowTestAssertionsFileName);
+
+const workflow = yaml.parse(fs.readFileSync(workflowFilePath, 'utf8'));
+const workflowJobs = parseWorkflowFile(workflow);
+
+const mockFileContent = getMockFileContent(workflowName, workflowJobs);
+const mockFilePath = path.join(workflowTestMocksDirectory, workflowTestMocksFileName);
+console.log(`Creating mock file ${mockFilePath}`);
+fs.writeFileSync(mockFilePath, mockFileContent);
+console.log(`Mock file ${mockFilePath} created`);
+
+const assertionsFileContent = getAssertionsFileContent(workflowName, 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 testFilePath = path.join(workflowTestsDirectory, workflowTestFileName);
+console.log(`Creating test file ${testFilePath}`);
+fs.writeFileSync(testFilePath, testFileContent);
+console.log(`Test file ${testFilePath} created`);
diff --git a/workflow_tests/utils/utils.js b/workflow_tests/utils/utils.js
new file mode 100644
index 000000000000..32e106cfb1de
--- /dev/null
+++ b/workflow_tests/utils/utils.js
@@ -0,0 +1,178 @@
+const yaml = require('yaml');
+const fs = require('fs');
+const path = require('path');
+
+function setUpActParams(act, event = null, eventOptions = null, secrets = null, githubToken = null, envVars = null, inputs = null) {
+    let updated_act = act;
+
+    if (event && eventOptions) {
+        // according to `Act` docs event data should be under the key with the event name (`[event]: eventOptions`), but
+        // for some event types this does not work (like `issues`), but providing the data on the JSON top level does,
+        // hence `...eventOptions` - this seems to cover all options
+        const eventData = {
+            [event]: eventOptions,
+            ...eventOptions,
+        };
+        updated_act = updated_act.setEvent(eventData);
+    }
+
+    if (secrets) {
+        Object.entries(secrets).forEach(([key, value]) => {
+            updated_act = updated_act.setSecret(key, value);
+        });
+    }
+
+    if (githubToken) {
+        updated_act = updated_act.setGithubToken(githubToken);
+    }
+
+    if (envVars) {
+        Object.entries(envVars).forEach(([key, value]) => {
+            updated_act = updated_act.setEnv(key, value);
+        });
+    }
+
+    if (inputs) {
+        Object.entries(inputs).forEach(([key, value]) => {
+            updated_act = updated_act.setInput(key, value);
+        });
+    }
+
+    return updated_act;
+}
+
+function createMockStep(name, message, job_id = null, inputs = null, in_envs = null, outputs = null, out_envs = null, isSuccessful = true, id = null) {
+    const mockStepName = name;
+    let mockWithCommand = 'echo [MOCK]';
+    if (job_id) {
+        mockWithCommand += ` [${job_id}]`;
+    }
+    mockWithCommand += ` ${message}`;
+    if (inputs) {
+        inputs.forEach((input) => {
+            mockWithCommand += `, ${input}="\${{ inputs.${input} && inputs.${input} || github.event.inputs.${input} }}"`;
+        });
+    }
+    if (in_envs) {
+        in_envs.forEach((env) => {
+            mockWithCommand += `, ${env}="\${{ env.${env} }}"`;
+        });
+    }
+    if (outputs) {
+        Object.entries(outputs).forEach(([key, value]) => {
+            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_OUTPUT"`;
+        });
+    }
+    if (out_envs) {
+        Object.entries(out_envs).forEach(([key, value]) => {
+            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_ENV"`;
+        });
+    }
+    if (!isSuccessful) {
+        mockWithCommand += '\nexit 1';
+    }
+    const mockStep = {
+        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) {
+    const stepName = `Main ${name}`;
+    const stepStatus = isSuccessful ? 0 : 1;
+    let stepOutput;
+    if (expectedOutput !== undefined && expectedOutput !== null) {
+        stepOutput = expectedOutput;
+    } else {
+        stepOutput = '[MOCK]';
+        if (jobId) {
+            stepOutput += ` [${jobId}]`;
+        }
+        if (message) {
+            stepOutput += ` ${message}`;
+        }
+        if (inputs) {
+            inputs.forEach((input) => {
+                stepOutput += `, ${input.key}=${input.value}`;
+            });
+        }
+        if (envs) {
+            envs.forEach((env) => {
+                stepOutput += `, ${env.key}=${env.value}`;
+            });
+        }
+    }
+    return {
+        name: stepName,
+        status: stepStatus,
+        output: stepOutput,
+    };
+}
+
+function setJobRunners(act, jobs, workflowPath) {
+    if (!act || !jobs || !workflowPath) {
+        return act;
+    }
+
+    const workflow = yaml.parse(fs.readFileSync(workflowPath, 'utf8'));
+    Object.entries(jobs).forEach(([jobId, runner]) => {
+        const job = workflow.jobs[jobId];
+        job['runs-on'] = runner;
+    });
+    fs.writeFileSync(workflowPath, yaml.stringify(workflow), 'utf8');
+    return act;
+}
+
+function deepCopy(originalObject) {
+    return JSON.parse(JSON.stringify(originalObject));
+}
+
+function getLogFilePath(workflowName, testName) {
+    const logsDir = path.resolve(__dirname, '..', 'logs');
+    if (!fs.existsSync(logsDir)) {
+        fs.mkdirSync(logsDir);
+    }
+    const workflowTestsLogDir = path.resolve(logsDir, workflowName);
+    if (!fs.existsSync(workflowTestsLogDir)) {
+        fs.mkdirSync(workflowTestsLogDir);
+    }
+    const cleanTestName = testName.replace(' ', '_').replace('-', '_').substr(0, 240);
+    return path.resolve(workflowTestsLogDir, `${cleanTestName}.log`);
+}
+
+function removeMockRepoDir() {
+    const mockDirRepo = path.resolve(__dirname, '..', '..', 'repo');
+    if (fs.existsSync(mockDirRepo)) {
+        fs.rmSync(mockDirRepo, {recursive: true, force: true});
+    }
+}
+
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+];
+
+module.exports = {
+    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
new file mode 100644
index 000000000000..dfa5e9362ce7
--- /dev/null
+++ b/workflow_tests/validateGithubActions.test.js
@@ -0,0 +1,90 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'validateGithubActions.yml'),
+        dest: '.github/workflows/validateGithubActions.yml',
+    },
+];
+
+describe('test workflow validateGithubActions', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testValidateGithubActionsWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('validateGithubActions', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('validateGithubActions', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+    });
+});
diff --git a/workflow_tests/verifyPodfile.test.js b/workflow_tests/verifyPodfile.test.js
new file mode 100644
index 000000000000..de062af2a2c2
--- /dev/null
+++ b/workflow_tests/verifyPodfile.test.js
@@ -0,0 +1,133 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'verifyPodfile.yml'),
+        dest: '.github/workflows/verifyPodfile.yml',
+    },
+];
+
+describe('test workflow verifyPodfile', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const osbotifyActor = 'OSBotify';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testVerifyPodfileWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            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);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/verifySignedCommits.test.js b/workflow_tests/verifySignedCommits.test.js
new file mode 100644
index 000000000000..911208e91f4a
--- /dev/null
+++ b/workflow_tests/verifySignedCommits.test.js
@@ -0,0 +1,90 @@
+const path = require('path');
+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');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'verifySignedCommits.yml'),
+        dest: '.github/workflows/verifySignedCommits.yml',
+    },
+];
+
+describe('test workflow verifySignedCommits', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testVerifySignedCommitsWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifySignedCommits', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifySignedCommitsJobExecuted(result);
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        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);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifySignedCommits', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifySignedCommitsJobExecuted(result);
+        });
+    });
+});