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/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index d4c17a734b1c..494326869cca 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -77,6 +77,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 +88,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/android/app/build.gradle b/android/app/build.gradle
index ed29eaa5e241..51c1cba7e621 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036101
-        versionName "1.3.61-1"
+        versionCode 1001036102
+        versionName "1.3.61-2"
     }
 
     flavorDimensions "default"
diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 42db4f642943..ae2b98ece85b 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -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/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index d64dfea72b33..7d3288fdbaee 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.61.1</string>
+	<string>1.3.61.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 475e4f02046a..c1f9b921841c 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.61.1</string>
+	<string>1.3.61.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 8df79230d1e0..8d87c8c87c93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.61-1",
+  "version": "1.3.61-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.61-1",
+      "version": "1.3.61-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 82cc96efd843..d1e0907e9317 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.61-1",
+  "version": "1.3.61-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
diff --git a/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/CONST.ts b/src/CONST.ts
index c4383a45b0b4..9735e6deb0ad 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1370,6 +1370,9 @@ const CONST = {
         MAKE_REQUEST_WITH_SIDE_EFFECTS: 'makeRequestWithSideEffects',
     },
 
+    MAP_PADDING: 50,
+    MAP_MARKER_SIZE: 20,
+
     QUICK_REACTIONS: [
         {
             name: '+1',
diff --git a/src/components/ConfirmedRoute.js b/src/components/ConfirmedRoute.js
new file mode 100644
index 000000000000..07d0fdc6ca97
--- /dev/null
+++ b/src/components/ConfirmedRoute.js
@@ -0,0 +1,118 @@
+import React, {useEffect} from 'react';
+import PropTypes from 'prop-types';
+import {View} from 'react-native';
+import MapView from 'react-native-x-maps';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import _ from 'underscore';
+import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
+import * as MapboxToken from '../libs/actions/MapboxToken';
+import * as Expensicons from './Icon/Expensicons';
+import theme from '../styles/themes/default';
+import styles from '../styles/styles';
+import transactionPropTypes from './transactionPropTypes';
+import BlockingView from './BlockingViews/BlockingView';
+import useNetwork from '../hooks/useNetwork';
+import useLocalize from '../hooks/useLocalize';
+
+const propTypes = {
+    /** Transaction that stores the distance request data */
+    transaction: transactionPropTypes,
+
+    /** Token needed to render the map */
+    mapboxToken: PropTypes.string,
+};
+
+const defaultProps = {
+    transaction: {},
+    mapboxToken: '',
+};
+
+const getWaypointMarkers = (waypoints) => {
+    const numberOfWaypoints = _.size(waypoints);
+    const lastWaypointIndex = numberOfWaypoints - 1;
+    return _.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={CONST.MAP_MARKER_SIZE}
+                        height={CONST.MAP_MARKER_SIZE}
+                        fill={theme.icon}
+                    />
+                ),
+            };
+        }),
+        (waypoint) => waypoint,
+    );
+};
+
+function ConfirmedRoute({mapboxToken, transaction}) {
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    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 && mapboxToken ? (
+                <MapView
+                    accessToken={mapboxToken}
+                    mapPadding={CONST.MAP_PADDING}
+                    pitchEnabled={false}
+                    directionCoordinates={coordinates}
+                    directionStyle={styles.mapDirection}
+                    style={styles.mapView}
+                    waypoints={waypointMarkers}
+                    styleURL={CONST.MAPBOX_STYLE_URL}
+                />
+            ) : (
+                <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>
+            )}
+        </>
+    );
+}
+
+export default withOnyx({
+    transaction: {
+        key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+    },
+    mapboxToken: {
+        key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
+        selector: (mapboxAccessToken) => mapboxAccessToken && mapboxAccessToken.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..126cea7e842e 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,6 +40,13 @@ 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) => ({
@@ -76,7 +83,6 @@ 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}
diff --git a/src/components/CountryPicker/index.js b/src/components/CountryPicker/index.js
index 684296d20b11..c6bbae0dd645 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';
@@ -34,14 +33,9 @@ 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);
     };
 
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 0dd74e4225d8..f5a0b1a50143 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -38,8 +38,14 @@ const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
 
 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,
@@ -55,17 +61,21 @@ const propTypes = {
 };
 
 const defaultProps = {
-    transactionID: '',
+    iou: {},
+    iouType: '',
+    report: {},
     transaction: {},
     mapboxAccessToken: {},
 };
 
-function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
+function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken}) {
     const [shouldShowGradient, setShouldShowGradient] = useState(false);
     const [scrollContainerHeight, setScrollContainerHeight] = useState(0);
     const [scrollContentHeight, setScrollContentHeight] = useState(0);
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
+
+    const reportID = lodashGet(report, 'reportID', '');
     const waypoints = useMemo(() => lodashGet(transaction, 'comment.waypoints', {}), [transaction]);
     const numberOfWaypoints = _.size(waypoints);
 
@@ -100,8 +110,8 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                         coordinate: [waypoint.lng, waypoint.lat],
                         markerComponent: () => (
                             <MarkerComponent
-                                width={20}
-                                height={20}
+                                width={CONST.MAP_MARKER_SIZE}
+                                height={CONST.MAP_MARKER_SIZE}
                                 fill={theme.icon}
                             />
                         ),
@@ -122,12 +132,12 @@ 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.
@@ -140,8 +150,8 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
             return;
         }
 
-        Transaction.getRoute(transactionID, waypoints);
-    }, [shouldFetchRoute, transactionID, waypoints, isOffline]);
+        Transaction.getRoute(iou.transactionID, waypoints);
+    }, [shouldFetchRoute, iou.transactionID, waypoints, isOffline]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
@@ -204,7 +214,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]}
@@ -236,6 +246,14 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                     </View>
                 )}
             </View>
+            <Button
+                success
+                style={[styles.w100, styles.mb4, styles.ph4, styles.flexShrink0]}
+                onPress={() => IOU.navigateToNextPage(iou, iouType, reportID, report)}
+                pressOnEnter
+                isDisabled={waypointMarkers.length < 2}
+                text={translate('common.next')}
+            />
         </>
     );
 }
@@ -245,7 +263,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/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 1586c2fb7e07..51467d4012e5 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -1,9 +1,10 @@
-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 styles from '../styles/styles';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
@@ -28,6 +29,10 @@ import Image from './Image';
 import useLocalize from '../hooks/useLocalize';
 import * as ReceiptUtils from '../libs/ReceiptUtils';
 import categoryPropTypes from './categoryPropTypes';
+import ConfirmedRoute from './ConfirmedRoute';
+import transactionPropTypes from './transactionPropTypes';
+import DistanceRequestUtils from '../libs/DistanceRequestUtils';
+import * as IOU from '../libs/actions/IOU';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -103,6 +108,27 @@ const propTypes = {
     /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /** 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,
 };
 
 const defaultProps = {
@@ -125,18 +151,41 @@ const defaultProps = {
     receiptSource: '',
     listStyles: [],
     policyCategories: {},
+    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 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 shouldCategoryEditable = !_.isEmpty(props.policyCategories) && !props.isDistanceRequest;
+
+    const formattedAmount = 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
@@ -158,7 +207,7 @@ function MoneyRequestConfirmationList(props) {
             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 [
             {
@@ -166,7 +215,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]);
 
     const selectedParticipants = useMemo(() => _.filter(props.selectedParticipants, (participant) => participant.selected), [props.selectedParticipants]);
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
@@ -294,8 +343,6 @@ function MoneyRequestConfirmationList(props) {
         [selectedParticipants, onSendMoney, onConfirm, props.iouType],
     );
 
-    const formattedAmount = CurrencyUtils.convertToDisplayString(props.iouAmount, props.iouCurrencyCode);
-
     const footerContent = useMemo(() => {
         if (props.isReadOnly) {
             return;
@@ -350,6 +397,11 @@ function MoneyRequestConfirmationList(props) {
             footerContent={footerContent}
             listStyles={props.listStyles}
         >
+            {props.isDistanceRequest && (
+                <View style={styles.confirmationListMapItem}>
+                    <ConfirmedRoute transactionID={props.transactionID} />
+                </View>
+            )}
             {!_.isEmpty(props.receiptPath) ? (
                 <Image
                     style={styles.moneyRequestImage}
@@ -357,10 +409,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}
@@ -402,16 +454,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={DistanceRequestUtils.getDistanceMerchant(distance, unit, rate, currency, translate)}
+                            description={translate('common.distance')}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            titleStyle={styles.flex1}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestRoute(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}
+                        />
+                    )}
+                    {shouldCategoryEditable && (
                         <MenuItemWithTopDescription
                             shouldShowRightIcon={!props.isReadOnly}
                             title={props.iouCategory}
@@ -439,5 +503,12 @@ export default compose(
         policyCategories: {
             key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
         },
+        mileageRate: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            selector: DistanceRequestUtils.getDefaultMileageRate,
+        },
+        transaction: {
+            key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        },
     }),
 )(MoneyRequestConfirmationList);
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 1fb611691fbb..61f82fe120a4 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -149,16 +149,11 @@ 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 isDistanceRequest = TransactionUtils.isDistanceRequest(props.transaction);
 
-    // 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;
-    }
-
     const getSettledMessage = () => {
         switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
             case CONST.IOU.PAYMENT_TYPE.PAYPAL_ME:
@@ -233,7 +228,7 @@ function MoneyRequestPreview(props) {
                     <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>
+                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getPreviewHeaderText()}</Text>
                                 {Boolean(getSettledMessage()) && (
                                     <>
                                         <Icon
@@ -242,7 +237,7 @@ function MoneyRequestPreview(props) {
                                             height={4}
                                             additionalStyles={[styles.mr1, styles.ml1]}
                                         />
-                                        <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>{getSettledMessage()}</Text>
+                                        <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getSettledMessage()}</Text>
                                     </>
                                 )}
                             </View>
@@ -277,7 +272,7 @@ function MoneyRequestPreview(props) {
                         </View>
                         {!props.isBillSplit && !_.isEmpty(requestMerchant) && (
                             <View style={[styles.flexRow]}>
-                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16, styles.breakWord]}>{requestMerchant}</Text>
+                                <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20, styles.breakWord]}>{requestMerchant}</Text>
                             </View>
                         )}
                         <View style={[styles.flexRow]}>
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index 44b0126d891d..3c4153fcc5e0 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -186,7 +186,7 @@ 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))}
@@ -209,7 +209,7 @@ function ReportPreview(props) {
                         {hasReceipts && !isScanning && (
                             <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/StatePicker/StateSelectorModal.js b/src/components/StatePicker/StateSelectorModal.js
index 91ee1b225a1f..c7cbd5be9e31 100644
--- a/src/components/StatePicker/StateSelectorModal.js
+++ b/src/components/StatePicker/StateSelectorModal.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 Modal from '../Modal';
@@ -44,6 +44,13 @@ 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) => ({
@@ -81,7 +88,6 @@ 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}
diff --git a/src/components/StatePicker/index.js b/src/components/StatePicker/index.js
index 5f3241181ee0..a4d3ea5e8133 100644
--- a/src/components/StatePicker/index.js
+++ b/src/components/StatePicker/index.js
@@ -1,6 +1,5 @@
-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 styles from '../../styles/styles';
 import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
@@ -38,14 +37,9 @@ 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);
     };
 
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index c3f1cec4ef1a..297d7de028fb 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -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();
diff --git a/src/languages/en.js b/src/languages/en.js
index f8ab044c4143..05aaa03902c5 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -161,6 +161,10 @@ export default {
         receipt: 'Receipt',
         replace: 'Replace',
         distance: 'Distance',
+        mile: 'mile',
+        miles: 'miles',
+        kilometer: 'kilometer',
+        kilometers: 'kilometers',
         recent: 'Recent',
         all: 'All',
     },
@@ -1254,7 +1258,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',
@@ -1667,12 +1670,6 @@ export default {
             selectSuggestedAddress: 'Please select a suggested address or use current location',
         },
     },
-    countrySelectorModal: {
-        placeholderText: 'Search to see options',
-    },
-    stateSelectorModal: {
-        placeholderText: 'Search to see options',
-    },
     demos: {
         saastr: {
             signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 7cd532a06275..56e728a57457 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -160,6 +160,10 @@ export default {
         receipt: 'Recibo',
         replace: 'Sustituir',
         distance: 'Distancia',
+        mile: 'milla',
+        miles: 'millas',
+        kilometer: 'kilómetro',
+        kilometers: 'kilómetros',
         recent: 'Reciente',
         all: 'Todo',
     },
@@ -1280,7 +1284,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',
@@ -2155,12 +2158,6 @@ export default {
             selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida o usa la ubicación actual.',
         },
     },
-    countrySelectorModal: {
-        placeholderText: 'Buscar para ver opciones',
-    },
-    stateSelectorModal: {
-        placeholderText: 'Buscar para ver opciones',
-    },
     demos: {
         saastr: {
             signInWelcome: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
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..25f26cc92b52
--- /dev/null
+++ b/src/libs/DistanceRequestUtils.js
@@ -0,0 +1,97 @@
+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
+ * @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 travled and the rate used for expense calculation
+ */
+const getDistanceMerchant = (distanceInMeters, unit, rate, currency, translate) => {
+    const convertedDistance = convertDistanceUnit(distanceInMeters, unit);
+    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 roundedDistance = convertedDistance.toFixed(2);
+    const unitString = roundedDistance === 1 ? singularDistanceUnit : distanceUnit;
+    const ratePerUnit = rate * 0.01;
+    const currencySymbol = CurrencyUtils.getCurrencySymbol(currency) || `${currency} `;
+
+    return `${roundedDistance} ${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);
+    return convertedDistance * rate;
+};
+
+export default {getDefaultMileageRate, getDistanceMerchant, getDistanceRequestAmount};
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/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index e4c55f852922..2b39c420511e 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -452,6 +452,7 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         shouldShowSubscript: false,
         isPolicyExpenseChat: false,
         isExpenseReport: false,
+        policyID: null,
     };
 
     const personalDetailMap = getPersonalDetailsForAccountIDs(accountIDs, personalDetails);
@@ -486,6 +487,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);
@@ -952,7 +954,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;
     }
 
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 7f247e6a649f..25569c63f2c8 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -819,6 +819,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 +839,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(
@@ -3572,6 +3583,7 @@ export {
     shouldDisableSettings,
     shouldDisableRename,
     hasSingleParticipant,
+    getReportRecipientAccountIDs,
     isOneOnOneChat,
     getTransactionReportName,
     getTransactionDetails,
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index bf00a030c115..9eb3658e3e53 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -44,9 +44,11 @@ Onyx.connect({
 });
 
 let userAccountID = '';
+let currentUserEmail = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
+        currentUserEmail = lodashGet(val, 'email', '');
         userAccountID = lodashGet(val, 'accountID', '');
     },
 });
@@ -83,6 +85,7 @@ function resetMoneyRequestInfo(id = '') {
         created,
         receiptPath: '',
         receiptSource: '',
+        transactionID: '',
     });
 }
 
@@ -312,8 +315,8 @@ 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]
  * @returns {Object} data
  * @returns {String} data.payerEmail
@@ -330,7 +333,19 @@ function buildOnyxDataForMoneyRequest(
  * @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 = null,
+) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
@@ -485,19 +500,13 @@ 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]
  */
-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) {
+    const {iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
         report,
         participant,
         comment,
@@ -505,16 +514,14 @@ function createDistanceRequest(report, payeeEmail, payeeAccountID, participant,
         'USD',
         created,
         '',
-        payeeAccountID,
-        payeeEmail,
+        null,
+        null,
         null,
         transactionID,
     );
-
     API.write(
         'CreateDistanceRequest',
         {
-            debtorEmail: payerEmail,
             comment,
             iouReportID: iouReport.reportID,
             chatReportID: chatReport.reportID,
@@ -523,11 +530,13 @@ function createDistanceRequest(report, payeeEmail, payeeAccountID, participant,
             createdChatReportActionID,
             createdIOUReportActionID,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
-            waypoints,
+            waypoints: JSON.stringify(transaction.comment.waypoints),
             created,
         },
         onyxData,
     );
+    Navigation.dismissModal(chatReport.reportID);
+    Report.notifyNewAction(chatReport.reportID, userAccountID);
 }
 
 /**
@@ -605,7 +614,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 +639,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 +758,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 +824,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,
diff --git a/src/libs/searchCountryOptions.js b/src/libs/searchCountryOptions.js
index 5aa8a052374e..9b0357a17a65 100644
--- a/src/libs/searchCountryOptions.js
+++ b/src/libs/searchCountryOptions.js
@@ -8,6 +8,10 @@ import StringUtils from './StringUtils';
  * @returns {Object[]} An array of countries/states sorted based on the search query
  */
 function searchCountryOptions(searchValue, countriesData) {
+    if (_.isEmpty(searchValue)) {
+        return countriesData;
+    }
+
     const trimmedSearchValue = StringUtils.sanitizeString(searchValue);
     if (_.isEmpty(trimmedSearchValue)) {
         return [];
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
index 791d7db97070..6c5bc2fc8da1 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -149,7 +149,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,
@@ -316,7 +315,8 @@ function ReportActionCompose({
         // 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);
diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index 80f49f177b6f..155f261693b5 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,
diff --git a/src/pages/iou/DistanceRequestPage.js b/src/pages/iou/DistanceRequestPage.js
index 706ddc43b018..d6eae999e2dc 100644
--- a/src/pages/iou/DistanceRequestPage.js
+++ b/src/pages/iou/DistanceRequestPage.js
@@ -1,38 +1,63 @@
 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}
+            transactionID={iou.transactionID}
         />
     );
 }
@@ -43,5 +68,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..d5d3ae8541df 100644
--- a/src/pages/iou/IOUCurrencySelection.js
+++ b/src/pages/iou/IOUCurrencySelection.js
@@ -84,7 +84,7 @@ function IOUCurrencySelection(props) {
             if (_.isEmpty(backTo) || props.navigation.getState().routes.length === 1) {
                 Navigation.goBack();
             } else {
-                Navigation.navigate(`${props.route.params.backTo}?currency=${option.currencyCode}`);
+                Navigation.goBack(`${props.route.params.backTo}?currency=${option.currencyCode}`, true);
             }
         },
         [props.route, props.navigation],
diff --git a/src/pages/iou/MoneyRequestDatePage.js b/src/pages/iou/MoneyRequestDatePage.js
index 33e3609da9aa..0fe9e7460d86 100644
--- a/src/pages/iou/MoneyRequestDatePage.js
+++ b/src/pages/iou/MoneyRequestDatePage.js
@@ -13,6 +13,7 @@ import ROUTES from '../../ROUTES';
 import * as IOU from '../../libs/actions/IOU';
 import NewDatePicker from '../../components/NewDatePicker';
 import useLocalize from '../../hooks/useLocalize';
+import CONST from '../../CONST';
 import {iouPropTypes, iouDefaultProps} from './propTypes';
 
 const propTypes = {
@@ -37,16 +38,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 = selectedTab === CONST.TAB.DISTANCE;
 
     useEffect(() => {
         const moneyRequestId = `${iouType}${reportID}`;
@@ -55,10 +60,10 @@ function MoneyRequestDatePage({iou, route}) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && (_.isEmpty(iou.participants) || (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.participants, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
@@ -109,4 +114,7 @@ export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(MoneyRequestDatePage);
diff --git a/src/pages/iou/MoneyRequestDescriptionPage.js b/src/pages/iou/MoneyRequestDescriptionPage.js
index e64ca595c52e..382f29c3c8e4 100644
--- a/src/pages/iou/MoneyRequestDescriptionPage.js
+++ b/src/pages/iou/MoneyRequestDescriptionPage.js
@@ -41,17 +41,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 = selectedTab === CONST.TAB.DISTANCE;
 
     useEffect(() => {
         const moneyRequestId = `${iouType}${reportID}`;
@@ -60,10 +64,10 @@ function MoneyRequestDescriptionPage({iou, route}) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
 
-        if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && (_.isEmpty(iou.participants) || (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.participants, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
@@ -124,4 +128,7 @@ export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(MoneyRequestDescriptionPage);
diff --git a/src/pages/iou/MoneyRequestSelectorPage.js b/src/pages/iou/MoneyRequestSelectorPage.js
index 21bfa89a1b5e..31b2c886bd16 100644
--- a/src/pages/iou/MoneyRequestSelectorPage.js
+++ b/src/pages/iou/MoneyRequestSelectorPage.js
@@ -20,6 +20,8 @@ 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';
 
 const propTypes = {
     /** React Navigation route */
@@ -34,12 +36,16 @@ 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,
+    report: {},
 };
 
 function MoneyRequestSelectorPage(props) {
@@ -53,6 +59,9 @@ function MoneyRequestSelectorPage(props) {
         [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 = canUseDistanceRequests && (isExpenseRequest || isFromGlobalCreate);
 
     const resetMoneyRequestInfo = () => {
         const moneyRequestID = `${iouType}${reportID}`;
@@ -96,10 +105,11 @@ function MoneyRequestSelectorPage(props) {
                                             initialParams={{reportID, iouType, pageIndex: 1}}
                                         />
                                     )}
-                                    {canUseDistanceRequests && (
+                                    {shouldDisplayDistanceRequest && (
                                         <TopTab.Screen
                                             name={CONST.TAB.DISTANCE}
                                             component={DistanceRequestPage}
+                                            initialParams={{reportID, iouType}}
                                         />
                                     )}
                                 </OnyxTabNavigator>
@@ -119,6 +129,9 @@ 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}`,
     },
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 42ae312ec8a2..8c063df63056 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -59,6 +59,7 @@ const defaultProps = {
 
 function MoneyRequestConfirmPage(props) {
     const {windowHeight} = useWindowDimensions();
+    const isDistanceRequest = props.selectedTab === CONST.TAB.DISTANCE;
     const prevMoneyRequestId = useRef(props.iou.id);
     const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
     const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
@@ -80,7 +81,7 @@ function MoneyRequestConfirmPage(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 (!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);
@@ -90,19 +91,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;
@@ -137,6 +138,17 @@ function MoneyRequestConfirmPage(props) {
         [props.report, props.iou.amount, props.iou.currency, props.iou.created, props.iou.merchant, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID],
     );
 
+    /**
+     * @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.report, props.iou.created, props.iou.transactionID],
+    );
+
     const createTransaction = useCallback(
         (selectedParticipants) => {
             const trimmedComment = props.iou.comment.trim();
@@ -176,6 +188,11 @@ function MoneyRequestConfirmPage(props) {
                 return;
             }
 
+            if (isDistanceRequest) {
+                createDistanceRequest(selectedParticipants, trimmedComment);
+                return;
+            }
+
             requestMoney(selectedParticipants, trimmedComment);
         },
         [
@@ -186,7 +203,9 @@ function MoneyRequestConfirmPage(props) {
             props.iou.currency,
             props.iou.receiptPath,
             props.iou.receiptSource,
+            isDistanceRequest,
             requestMoney,
+            createDistanceRequest,
         ],
     );
 
@@ -223,7 +242,7 @@ function MoneyRequestConfirmPage(props) {
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
-                        title={props.translate('iou.cash')}
+                        title={isDistanceRequest ? props.translate('common.distance') : props.translate('iou.cash')}
                         onBackButtonPress={navigateBack}
                     />
                     {/*
@@ -237,6 +256,7 @@ function MoneyRequestConfirmPage(props) {
                             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}
@@ -267,6 +287,7 @@ function MoneyRequestConfirmPage(props) {
                                 bankAccountRoute={ReportUtils.getBankAccountRoute(props.report)}
                                 iouMerchant={props.iou.merchant}
                                 iouCreated={props.iou.created}
+                                isDistanceRequest={isDistanceRequest}
                                 listStyles={[StyleUtils.getMaximumHeight(windowHeight / 3)]}
                             />
                         </ScrollView>
@@ -285,14 +306,27 @@ 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.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        },
     }),
 )(MoneyRequestConfirmPage);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
index 0b13173f5c90..949e17d02ffe 100644
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
@@ -34,6 +34,9 @@ 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]).isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -45,6 +48,7 @@ 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', ''));
+    const isDistanceRequest = props.selectedTab === CONST.TAB.DISTANCE;
 
     const navigateToNextStep = () => {
         Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
@@ -58,7 +62,7 @@ function MoneyRequestParticipantsPage(props) {
         // 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) {
             // The ID is cleared on completing a request. In that case, we will do nothing
-            if (props.iou.id) {
+            if (!isDistanceRequest && props.iou.id) {
                 navigateBack(true);
             }
             return;
@@ -70,15 +74,14 @@ function MoneyRequestParticipantsPage(props) {
         if (shouldReset) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
-
-        if ((props.iou.amount === 0 && !props.iou.receiptPath) || shouldReset) {
+        if (!isDistanceRequest && ((props.iou.amount === 0 && !props.iou.receiptPath) || shouldReset)) {
             navigateBack(true);
         }
 
         return () => {
             prevMoneyRequestId.current = props.iou.id;
         };
-    }, [props.iou.amount, props.iou.id, props.iou.receiptPath]);
+    }, [props.iou.amount, props.iou.id, props.iou.receiptPath, isDistanceRequest]);
 
     return (
         <ScreenWrapper
@@ -88,7 +91,7 @@ function MoneyRequestParticipantsPage(props) {
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={styles.flex1}>
                     <HeaderWithBackButton
-                        title={props.translate('iou.cash')}
+                        title={isDistanceRequest ? props.translate('common.distance') : props.translate('iou.cash')}
                         onBackButtonPress={navigateBack}
                     />
                     {iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT ? (
@@ -104,6 +107,7 @@ function MoneyRequestParticipantsPage(props) {
                             onAddParticipants={IOU.setMoneyRequestParticipants}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                             iouType={iouType.current}
+                            isDistanceRequest={isDistanceRequest}
                         />
                     )}
                 </View>
@@ -120,5 +124,8 @@ export default compose(
     withLocalize,
     withOnyx({
         iou: {key: ONYXKEYS.IOU},
+        selectedTab: {
+            key: `${ONYXKEYS.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..ef1d6565f595 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -34,8 +34,8 @@ 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,
 };
@@ -45,6 +45,7 @@ const defaultProps = {
     personalDetails: {},
     reports: {},
     betas: [],
+    isDistanceRequest: false,
 };
 
 class MoneyRequestParticipantsSelector extends Component {
@@ -89,7 +90,7 @@ class MoneyRequestParticipantsSelector extends Component {
             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,
+            !this.props.isDistanceRequest,
         );
     }
 
@@ -189,8 +190,5 @@ export default compose(
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        selectedTab: {
-            key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
-        },
     }),
 )(MoneyRequestParticipantsSelector);
diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js
index 1da13b10dbb4..fbe8fd92b09c 100644
--- a/src/pages/iou/steps/NewRequestAmountPage.js
+++ b/src/pages/iou/steps/NewRequestAmountPage.js
@@ -20,6 +20,7 @@ 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 +43,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 +64,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 = selectedTab === CONST.TAB.DISTANCE;
 
     const currency = currentCurrency || iou.currency;
 
@@ -108,7 +114,7 @@ function NewRequestAmountPage({route, iou, report}) {
                 IOU.resetMoneyRequestInfo(moneyRequestID);
             }
 
-            if (_.isEmpty(iou.participants) || iou.amount === 0 || shouldReset) {
+            if (!isDistanceRequestTab && (_.isEmpty(iou.participants) || iou.amount === 0 || shouldReset)) {
                 Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
             }
         }
@@ -116,13 +122,19 @@ function NewRequestAmountPage({route, iou, report}) {
         return () => {
             prevMoneyRequestID.current = iou.id;
         };
-    }, [iou.participants, iou.amount, iou.id, isEditing, iouType, reportID]);
+    }, [iou.participants, 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));
@@ -188,4 +200,7 @@ export default withOnyx({
     report: {
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
     },
+    selectedTab: {
+        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
 })(NewRequestAmountPage);
diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.js b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
index 814d47e003b7..b26c833aee11 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,10 +59,10 @@ 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});
@@ -236,9 +232,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/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js
index 718b2bd91290..c4fdda42114f 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);
 
     /**
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
index 5a150c2c4eb2..e72b02e18696 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},
         ];
     }
 
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/styles.js b/src/styles/styles.js
index 3743d27937ce..f08c939e73b0 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3874,6 +3874,11 @@ const styles = {
         overflow: 'hidden',
     },
 
+    confirmationListMapItem: {
+        ...spacing.m5,
+        height: 200,
+    },
+
     mapDirection: {
         lineColor: Colors.green,
         lineWidth: 7,
diff --git a/src/types/onyx/IOU.ts b/src/types/onyx/IOU.ts
index 373b5d990160..66f85c98d70c 100644
--- a/src/types/onyx/IOU.ts
+++ b/src/types/onyx/IOU.ts
@@ -13,6 +13,11 @@ 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[];
 };
 
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/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',
+            });
+        }
+    });
+});