diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index 528a0a11498a..b20cc83498ba 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -255,7 +255,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -268,7 +268,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -281,85 +281,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -393,6 +397,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index f042dbb38a91..6b8401a08d6d 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -367,7 +367,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -380,7 +380,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -393,85 +393,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -505,6 +509,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 8e10f8b1d8b6..dffc089ea5c5 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -334,7 +334,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -347,7 +347,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -360,85 +360,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -472,6 +476,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
index 4441348a3c36..63398614fd11 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
@@ -40,8 +40,11 @@ async function run() {
 
         // Next, we generate the checklist body
         let checklistBody = '';
+        let checklistAssignees = [];
         if (shouldCreateNewDeployChecklist) {
-            checklistBody = await GithubUtils.generateStagingDeployCashBody(newVersionTag, _.map(mergedPRs, GithubUtils.getPullRequestURLFromNumber));
+            const {issueBody, issueAssignees} = await GithubUtils.generateStagingDeployCashBodyAndAssignees(newVersionTag, _.map(mergedPRs, GithubUtils.getPullRequestURLFromNumber));
+            checklistBody = issueBody;
+            checklistAssignees = issueAssignees;
         } else {
             // Generate the updated PR list, preserving the previous state of `isVerified` for existing PRs
             const PRList = _.reduce(
@@ -94,7 +97,7 @@ async function run() {
             }
 
             const didVersionChange = newVersionTag !== currentChecklistData.tag;
-            checklistBody = await GithubUtils.generateStagingDeployCashBody(
+            const {issueBody, issueAssignees} = await GithubUtils.generateStagingDeployCashBodyAndAssignees(
                 newVersionTag,
                 _.pluck(PRList, 'url'),
                 _.pluck(_.where(PRList, {isVerified: true}), 'url'),
@@ -105,6 +108,8 @@ async function run() {
                 didVersionChange ? false : currentChecklistData.isFirebaseChecked,
                 didVersionChange ? false : currentChecklistData.isGHStatusChecked,
             );
+            checklistBody = issueBody;
+            checklistAssignees = issueAssignees;
         }
 
         // Finally, create or update the checklist
@@ -119,7 +124,7 @@ async function run() {
                 ...defaultPayload,
                 title: `Deploy Checklist: New Expensify ${format(new Date(), CONST.DATE_FORMAT_STRING)}`,
                 labels: [CONST.LABELS.STAGING_DEPLOY],
-                assignees: [CONST.APPLAUSE_BOT],
+                assignees: [CONST.APPLAUSE_BOT].concat(checklistAssignees),
             });
             console.log(`Successfully created new StagingDeployCash! 🎉 ${newChecklist.html_url}`);
             return newChecklist;
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
index 154dacbdc3c3..60ec0b9f0ae3 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -49,8 +49,11 @@ async function run() {
 
         // Next, we generate the checklist body
         let checklistBody = '';
+        let checklistAssignees = [];
         if (shouldCreateNewDeployChecklist) {
-            checklistBody = await GithubUtils.generateStagingDeployCashBody(newVersionTag, _.map(mergedPRs, GithubUtils.getPullRequestURLFromNumber));
+            const {issueBody, issueAssignees} = await GithubUtils.generateStagingDeployCashBodyAndAssignees(newVersionTag, _.map(mergedPRs, GithubUtils.getPullRequestURLFromNumber));
+            checklistBody = issueBody;
+            checklistAssignees = issueAssignees;
         } else {
             // Generate the updated PR list, preserving the previous state of `isVerified` for existing PRs
             const PRList = _.reduce(
@@ -103,7 +106,7 @@ async function run() {
             }
 
             const didVersionChange = newVersionTag !== currentChecklistData.tag;
-            checklistBody = await GithubUtils.generateStagingDeployCashBody(
+            const {issueBody, issueAssignees} = await GithubUtils.generateStagingDeployCashBodyAndAssignees(
                 newVersionTag,
                 _.pluck(PRList, 'url'),
                 _.pluck(_.where(PRList, {isVerified: true}), 'url'),
@@ -114,6 +117,8 @@ async function run() {
                 didVersionChange ? false : currentChecklistData.isFirebaseChecked,
                 didVersionChange ? false : currentChecklistData.isGHStatusChecked,
             );
+            checklistBody = issueBody;
+            checklistAssignees = issueAssignees;
         }
 
         // Finally, create or update the checklist
@@ -128,7 +133,7 @@ async function run() {
                 ...defaultPayload,
                 title: `Deploy Checklist: New Expensify ${format(new Date(), CONST.DATE_FORMAT_STRING)}`,
                 labels: [CONST.LABELS.STAGING_DEPLOY],
-                assignees: [CONST.APPLAUSE_BOT],
+                assignees: [CONST.APPLAUSE_BOT].concat(checklistAssignees),
             });
             console.log(`Successfully created new StagingDeployCash! 🎉 ${newChecklist.html_url}`);
             return newChecklist;
@@ -406,7 +411,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -419,7 +424,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -432,85 +437,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -544,6 +553,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index ea56ff5f4ebd..b8cb062feba5 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -293,7 +293,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -306,7 +306,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -319,85 +319,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -431,6 +435,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index f272929d536a..c57ebf0fefe4 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -349,7 +349,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -362,7 +362,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -375,85 +375,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -487,6 +491,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index b8d7d821d64e..9eb608a8cc05 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -301,7 +301,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -314,7 +314,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -327,85 +327,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -439,6 +443,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js
index cc1321ce5cd5..ea12ef5f0df0 100644
--- a/.github/actions/javascript/getReleaseBody/index.js
+++ b/.github/actions/javascript/getReleaseBody/index.js
@@ -301,7 +301,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -314,7 +314,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -327,85 +327,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -439,6 +443,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
index 8124c5795a5a..32b8b64d7b82 100644
--- a/.github/actions/javascript/isStagingDeployLocked/index.js
+++ b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -285,7 +285,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -298,7 +298,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -311,85 +311,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -423,6 +427,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 36cd0aaefe4a..d275edf9d789 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -450,7 +450,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -463,7 +463,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -476,85 +476,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -588,6 +592,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js
index 329e0d3aad5d..3bd3e6121be8 100644
--- a/.github/actions/javascript/postTestBuildComment/index.js
+++ b/.github/actions/javascript/postTestBuildComment/index.js
@@ -360,7 +360,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -373,7 +373,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -386,85 +386,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -498,6 +502,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index 6a5f89badb5e..9c740914dc1b 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -255,7 +255,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -268,7 +268,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -281,85 +281,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -393,6 +397,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index 322b529b89bf..7b162f06840d 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -255,7 +255,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -268,7 +268,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -281,85 +281,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -393,6 +397,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index ba188d3a2b86..07173cb19bc5 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -255,7 +255,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -268,7 +268,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -281,85 +281,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
 
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -393,6 +397,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js
index 0cd407c78153..47ad2440c165 100644
--- a/.github/libs/GithubUtils.js
+++ b/.github/libs/GithubUtils.js
@@ -222,7 +222,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the issue body for a StagingDeployCash.
+     * Generate the issue body and assignees for a StagingDeployCash.
      *
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
@@ -235,7 +235,7 @@ class GithubUtils {
      * @param {Boolean} [isGHStatusChecked]
      * @returns {Promise}
      */
-    static generateStagingDeployCashBody(
+    static generateStagingDeployCashBodyAndAssignees(
         tag,
         PRList,
         verifiedPRList = [],
@@ -248,85 +248,89 @@ class GithubUtils {
     ) {
         return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
             .then((data) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
-                //    'https://github.com/Expensify/App/pull/9642': [ 'mountiny', 'kidroca' ]
-                // }
-                const internalQAPRMap = _.reduce(
-                    _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA}))),
-                    (map, pr) => {
-                        // eslint-disable-next-line no-param-reassign
-                        map[pr.html_url] = _.compact(_.pluck(pr.assignees, 'login'));
-                        return map;
-                    },
-                    {},
-                );
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-
-                const noQAPRs = _.pluck(
-                    _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
-                    'html_url',
-                );
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
-
-                const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
-                const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
-
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-
-                // PR list
-                if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-
-                // Internal QA PR list
-                if (!_.isEmpty(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    _.each(internalQAPRMap, (assignees, URL) => {
-                        const assigneeMentions = _.reduce(assignees, (memo, assignee) => `${memo} @${assignee}`, '');
-                        issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` -${assigneeMentions}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-
-                // Deploy blockers
-                if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isTimingDashboardChecked ? 'x' : ' '
-                }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${
-                    isFirebaseChecked ? 'x' : ' '
-                }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                return issueBody;
+                const internalQAPRs = _.filter(data, (pr) => !_.isEmpty(_.findWhere(pr.labels, {name: CONST.LABELS.INTERNAL_QA})));
+                return Promise.all(_.map(internalQAPRs, (pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({url: pr.html_url, mergerLogin})))).then((results) => {
+                    // The format of this map is following:
+                    // {
+                    //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                    //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                    // }
+                    const internalQAPRMap = _.reduce(
+                        results,
+                        (acc, {url, mergerLogin}) => {
+                            acc[url] = mergerLogin;
+                            return acc;
+                        },
+                        {},
+                    );
+                    console.log('Found the following Internal QA PRs:', internalQAPRMap);
+
+                    const noQAPRs = _.pluck(
+                        _.filter(data, (PR) => /\[No\s?QA]/i.test(PR.title)),
+                        'html_url',
+                    );
+                    console.log('Found the following NO QA PRs:', noQAPRs);
+                    const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);
+
+                    const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
+                    const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);
+
+                    // Tag version and comparison URL
+                    // eslint-disable-next-line max-len
+                    let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+
+                    // PR list
+                    if (!_.isEmpty(sortedPRList)) {
+                        issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                        _.each(sortedPRList, (URL) => {
+                            issueBody += _.contains(verifiedOrNoQAPRs, URL) ? '- [x]' : '- [ ]';
+                            issueBody += ` ${URL}\r\n`;
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
+
+                    // Internal QA PR list
+                    if (!_.isEmpty(internalQAPRMap)) {
+                        console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                        issueBody += '**Internal QA:**\r\n';
+                        _.each(internalQAPRMap, (merger, URL) => {
+                            const mergerMention = `@${merger}`;
+                            issueBody += `${_.contains(resolvedInternalQAPRs, URL) ? '- [x]' : '- [ ]'} `;
+                            issueBody += `${URL}`;
+                            issueBody += ` - ${mergerMention}`;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
+
+                    // Deploy blockers
+                    if (!_.isEmpty(deployBlockers)) {
+                        issueBody += '**Deploy Blockers:**\r\n';
+                        _.each(sortedDeployBlockers, (URL) => {
+                            issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x] ' : '- [ ] ';
+                            issueBody += URL;
+                            issueBody += '\r\n';
+                        });
+                        issueBody += '\r\n\r\n';
+                    }
+
+                    issueBody += '**Deployer verifications:**';
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isTimingDashboardChecked ? 'x' : ' '
+                    }] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${
+                        isFirebaseChecked ? 'x' : ' '
+                    }] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                    // eslint-disable-next-line max-len
+                    issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+
+                    issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                    const issueAssignees = _.uniq(_.values(internalQAPRMap));
+                    const issue = {issueBody, issueAssignees};
+                    return issue;
+                });
             })
             .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
     }
@@ -360,6 +364,20 @@ class GithubUtils {
             .catch((err) => console.error('Failed to get PR list', err));
     }
 
+    /**
+     * @param {Number} pullRequestNumber
+     * @returns {Promise}
+     */
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: pullRequestNumber,
+            })
+            .then(({data: pullRequest}) => pullRequest.merged_by.login);
+    }
+
     /**
      * @param {Number} pullRequestNumber
      * @returns {Promise}
diff --git a/__mocks__/@react-native-clipboard/clipboard.js b/__mocks__/@react-native-clipboard/clipboard.js
deleted file mode 100644
index e56e290c3cc9..000000000000
--- a/__mocks__/@react-native-clipboard/clipboard.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import MockClipboard from '@react-native-clipboard/clipboard/jest/clipboard-mock';
-
-export default MockClipboard;
diff --git a/__mocks__/@react-native-clipboard/clipboard.ts b/__mocks__/@react-native-clipboard/clipboard.ts
new file mode 100644
index 000000000000..75b6f09f5345
--- /dev/null
+++ b/__mocks__/@react-native-clipboard/clipboard.ts
@@ -0,0 +1,3 @@
+import clipboardMock from '@react-native-clipboard/clipboard/jest/clipboard-mock';
+
+export default clipboardMock;
diff --git a/__mocks__/react-native-document-picker.js b/__mocks__/react-native-document-picker.ts
similarity index 64%
rename from __mocks__/react-native-document-picker.js
rename to __mocks__/react-native-document-picker.ts
index 8cba2bc1eba4..6d26a0227fc3 100644
--- a/__mocks__/react-native-document-picker.js
+++ b/__mocks__/react-native-document-picker.ts
@@ -1,9 +1,16 @@
-export default {
-    getConstants: jest.fn(),
+import type {pick, pickDirectory, releaseSecureAccess, types} from 'react-native-document-picker';
+
+type ReactNativeDocumentPickerMock = {
+    pick: typeof pick;
+    releaseSecureAccess: typeof releaseSecureAccess;
+    pickDirectory: typeof pickDirectory;
+    types: typeof types;
+};
+
+const reactNativeDocumentPickerMock: ReactNativeDocumentPickerMock = {
     pick: jest.fn(),
     releaseSecureAccess: jest.fn(),
     pickDirectory: jest.fn(),
-
     types: Object.freeze({
         allFiles: 'public.item',
         audio: 'public.audio',
@@ -21,3 +28,5 @@ export default {
         zip: 'public.zip-archive',
     }),
 };
+
+export default reactNativeDocumentPickerMock;
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9c5db608a846..62e30858e73c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045503
-        versionName "1.4.55-3"
+        versionCode 1001045602
+        versionName "1.4.56-2"
     }
 
     flavorDimensions "default"
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index b8ae9d0a2be5..efa8a25a0614 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -10,7 +10,7 @@
         "electron-context-menu": "^2.3.0",
         "electron-log": "^4.4.8",
         "electron-serve": "^1.3.0",
-        "electron-updater": "^6.1.9",
+        "electron-updater": "^6.2.1",
         "node-machine-id": "^1.1.12"
       }
     },
@@ -156,9 +156,9 @@
       }
     },
     "node_modules/electron-updater": {
-      "version": "6.1.9",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.9.tgz",
-      "integrity": "sha512-omoTwGSG+/H8G62cEZS/dc5Lmc4HohAd4198AP+JNv8H7bfxXUCKekaR6WpsN1n2DiWzvcqOusfGSogZv/uj9w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
+      "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
       "dependencies": {
         "builder-util-runtime": "9.2.4",
         "fs-extra": "^10.1.0",
@@ -541,9 +541,9 @@
       "integrity": "sha512-OEC/48ZBJxR6XNSZtCl4cKPyQ1lvsu8yp8GdCplMWwGS1eEyMcEmzML5BRs/io/RLDnpgyf+7rSL+X6ICifRIg=="
     },
     "electron-updater": {
-      "version": "6.1.9",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.9.tgz",
-      "integrity": "sha512-omoTwGSG+/H8G62cEZS/dc5Lmc4HohAd4198AP+JNv8H7bfxXUCKekaR6WpsN1n2DiWzvcqOusfGSogZv/uj9w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
+      "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
       "requires": {
         "builder-util-runtime": "9.2.4",
         "fs-extra": "^10.1.0",
diff --git a/desktop/package.json b/desktop/package.json
index 606fcac92500..4249f3fcfba9 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -7,7 +7,7 @@
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
     "electron-serve": "^1.3.0",
-    "electron-updater": "^6.1.9",
+    "electron-updater": "^6.2.1",
     "node-machine-id": "^1.1.12"
   },
   "author": "Expensify, Inc.",
diff --git a/docs/articles/expensify-classic/expenses/Add-expenses-to-a-report.md b/docs/articles/expensify-classic/expenses/Add-expenses-to-a-report.md
new file mode 100644
index 000000000000..96427a60d87f
--- /dev/null
+++ b/docs/articles/expensify-classic/expenses/Add-expenses-to-a-report.md
@@ -0,0 +1,18 @@
+---
+title: Add expenses to a report
+description: Add expenses to a report to submit them for approval
+---
+<div id="expensify-classic" markdown="1">
+
+To submit expenses for approval, they must be added to a report. 
+
+1. Click the **Expenses** tab.
+2. Find the expenses you want to add to the report by searching through the table of expenses and/or using the sort filters. 
+3. Select the expenses by checking the box to the left of each expense or selecting them all. 
+4. Click **Add to Report** in the right corner and select either: 
+   - **Auto-Report**: Automatically adds the expenses to an open report, or creates a new report if there are no open reports
+   - **New Report**: Creates a new report for the expenses 
+   - **None**: Ensures none of the selected expenses are attached to a report (as long as the report has not already been submitted)
+   - **Existing Report**: Adds the expenses to the selected report 
+
+</div>
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md b/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
index ecdea4699ee0..47e7a5b5382a 100644
--- a/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
@@ -34,7 +34,7 @@ In order to complete the steps below, you'll need a Workday System Administrator
 4. Search and select "security group membership and access".
 5. Search for the security group you just created.
 6. Click the ellipsis, then **Security Group > Maintain Domain Permissions for Security Group**.
-7. Under **Integration Permissions**, add "External Account Provisioning" to **Domain Security Workspaces permitting Put access** and "Worker Data: Workers" to **Domain Security Workspaces permitting Get access**.
+7. Head to Integration Permissions and add **Get access** for “External Account Provisioning” and “Worker Data: Workers” under Domain Security Workspaces.
 8. Click **OK** and **Done**.
 9. Search **Activate Pending Security Workspace Changes** and complete the task for activating the security workspace change, adding a comment if required and checking the **Confirmed** check-box.
 
diff --git a/docs/articles/expensify-classic/workspaces/Set-time-and-distance-rates.md b/docs/articles/expensify-classic/workspaces/Set-time-and-distance-rates.md
new file mode 100644
index 000000000000..e81e05446379
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Set-time-and-distance-rates.md
@@ -0,0 +1,24 @@
+---
+title: Set time and distance rates
+description: Set rates for hourly and mileage expenses
+---
+<div id="expensify-classic" markdown="1">
+
+You can set rates for your workspace’s hourly billable and mileage expenses. 
+
+1. Hover over Settings, then click **Workspaces**. 
+2. Click the **Group** tab on the left. 
+3. Click the desired workspace name. 
+4. Click the **Expenses** tab on the left. 
+5. Scroll down to the time or distance section and set your rates.
+   - For distance: 
+      - If desired, adjust your unit (miles or kilometers) and your default category. These options will apply to all of your distance rates. 
+      - To add a new rate, click **Add a Mileage Rate**. 
+      - To edit an existing rate, 
+         - Click the toggle to enable or disable the rate. 
+         - Click the name or rate field to edit them.
+   - For time, 
+      - Click the Enable toggle to enable hourly rate expenses.
+      - Enter the default hourly rate.
+
+</div>
diff --git a/docs/redirects.csv b/docs/redirects.csv
index df4e2a45dce3..7539a2777d92 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -66,3 +66,4 @@ https://help.expensify.com/articles/expensify-classic/expensify-billing/Individu
 https://help.expensify.com/articles/expensify-classic/settings/Merge-Accounts,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
 https://help.expensify.com/articles/expensify-classic/settings/Preferences,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
 https://help.expensify.com/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager,https://use.expensify.com/support
+https://help.expensify.com/articles/expensify-classic/settings/Copilot,https://help.expensify.com/expensify-classic/hubs/copilots-and-delegates/
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 5e2ba1fcd614..a962c69f0bc6 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.55</string>
+	<string>1.4.56</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.3</string>
+	<string>1.4.56.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 69472200e46d..9f20eb574abc 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.55</string>
+	<string>1.4.56</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.3</string>
+	<string>1.4.56.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 008ca16909b0..2319ff879a03 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.55</string>
+	<string>1.4.56</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.3</string>
+	<string>1.4.56.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 4bff5eaf6eb8..fcebc3cd46dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.55-3",
+  "version": "1.4.56-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.55-3",
+      "version": "1.4.56-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 53eb229d7b85..c41afac9d570 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.55-3",
+  "version": "1.4.56-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.",
@@ -50,8 +50,8 @@
     "analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
-    "symbolicate-release:ios": "scripts/release-profile.js --platform=ios",
-    "symbolicate-release:android": "scripts/release-profile.js --platform=android",
+    "symbolicate-release:ios": "scripts/release-profile.ts --platform=ios",
+    "symbolicate-release:android": "scripts/release-profile.ts --platform=android",
     "test:e2e": "ts-node tests/e2e/testRunner.ts --config ./config.local.ts",
     "test:e2e:dev": "ts-node tests/e2e/testRunner.ts --config ./config.dev.ts",
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
diff --git a/scripts/release-profile.js b/scripts/release-profile.ts
similarity index 83%
rename from scripts/release-profile.js
rename to scripts/release-profile.ts
index 0f96232bcdca..8ec0979f9f9e 100755
--- a/scripts/release-profile.js
+++ b/scripts/release-profile.ts
@@ -1,13 +1,15 @@
-#!/usr/bin/env node
+#!/usr/bin/env ts-node
+
 /* eslint-disable no-console */
+import {execSync} from 'child_process';
+import fs from 'fs';
 
-const fs = require('fs');
-const {execSync} = require('child_process');
+type ArgsMap = Record<string, string>;
 
 // Function to parse command-line arguments into a key-value object
-function parseCommandLineArguments() {
+function parseCommandLineArguments(): ArgsMap {
     const args = process.argv.slice(2); // Skip node and script paths
-    const argsMap = {};
+    const argsMap: ArgsMap = {};
     args.forEach((arg) => {
         const [key, value] = arg.split('=');
         if (key.startsWith('--')) {
@@ -20,14 +22,13 @@ function parseCommandLineArguments() {
 // Function to find .cpuprofile files in the current directory
 function findCpuProfileFiles() {
     const files = fs.readdirSync(process.cwd());
-    // eslint-disable-next-line rulesdir/prefer-underscore-method
     return files.filter((file) => file.endsWith('.cpuprofile'));
 }
 
 const argsMap = parseCommandLineArguments();
 
 // Determine sourcemapPath based on the platform flag passed
-let sourcemapPath;
+let sourcemapPath: string | undefined;
 if (argsMap.platform === 'ios') {
     sourcemapPath = 'main.jsbundle.map';
 } else if (argsMap.platform === 'android') {
@@ -57,7 +58,10 @@ if (cpuProfiles.length === 0) {
         const output = execSync(command, {stdio: 'inherit'});
         console.log(output.toString());
     } catch (error) {
-        console.error(`Error executing command: ${error}`);
+        if (error instanceof Error) {
+            console.error(`Error executing command: ${error.toString()}`);
+        }
+
         process.exit(1);
     }
 }
diff --git a/src/CONST.ts b/src/CONST.ts
index 18fa41e526d9..8ffaab2016e4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1679,7 +1679,7 @@ const CONST = {
 
         POLICY_ID_FROM_PATH: /\/w\/([a-zA-Z0-9]+)(\/|$)/,
 
-        SHORT_MENTION: new RegExp(`@[\\w\\-\\+\\'#]+(?:\\.[\\w\\-\\'\\+]+)*`, 'gim'),
+        SHORT_MENTION: new RegExp(`@[\\w\\-\\+\\'#@]+(?:\\.[\\w\\-\\'\\+]+)*`, 'gim'),
     },
 
     PRONOUNS: {
@@ -4135,6 +4135,22 @@ const CONST = {
     SESSION_STORAGE_KEYS: {
         INITIAL_URL: 'INITIAL_URL',
     },
+    DEFAULT_TAX: {
+        defaultExternalID: 'id_TAX_EXEMPT',
+        defaultValue: '0%',
+        foreignTaxDefault: 'id_TAX_EXEMPT',
+        name: 'Tax',
+        taxes: {
+            id_TAX_EXEMPT: {
+                name: 'Tax exempt',
+                value: '0%',
+            },
+            id_TAX_RATE_1: {
+                name: 'Tax Rate 1',
+                value: '5%',
+            },
+        },
+    },
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;
diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
index 9901ff9243f9..d0aa2e206eb2 100644
--- a/src/components/AddressSearch/index.tsx
+++ b/src/components/AddressSearch/index.tsx
@@ -455,3 +455,5 @@ function AddressSearch(
 AddressSearch.displayName = 'AddressSearchWithRef';
 
 export default forwardRef(AddressSearch);
+
+export type {AddressSearchProps};
diff --git a/src/components/AddressSearch/types.ts b/src/components/AddressSearch/types.ts
index 27e068cd1777..efbcc6374341 100644
--- a/src/components/AddressSearch/types.ts
+++ b/src/components/AddressSearch/types.ts
@@ -96,4 +96,4 @@ type AddressSearchProps = {
 
 type IsCurrentTargetInsideContainerType = (event: FocusEvent | NativeSyntheticEvent<TextInputFocusEventData>, containerRef: RefObject<View | HTMLElement>) => boolean;
 
-export type {CurrentLocationButtonProps, AddressSearchProps, RenamedInputKeysProps, IsCurrentTargetInsideContainerType};
+export type {CurrentLocationButtonProps, AddressSearchProps, RenamedInputKeysProps, IsCurrentTargetInsideContainerType, StreetValue};
diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
index 0c047ce52dc8..442b3cd864d6 100755
--- a/src/components/AttachmentModal.tsx
+++ b/src/components/AttachmentModal.tsx
@@ -549,7 +549,7 @@ function AttachmentModal({
                                         // @ts-expect-error TODO: Remove this once Attachments (https://github.com/Expensify/App/issues/24969) is migrated to TypeScript.
                                         containerStyles={[styles.mh5]}
                                         source={sourceForAttachmentView}
-                                        isAuthTokenRequired={isAuthTokenRequired}
+                                        isAuthTokenRequired={isAuthTokenRequiredState}
                                         file={file}
                                         onToggleKeyboard={updateConfirmButtonVisibility}
                                         isWorkspaceAvatar={isWorkspaceAvatar}
diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx
index 56fe7c4d0b42..a46b37c986ba 100644
--- a/src/components/Banner.tsx
+++ b/src/components/Banner.tsx
@@ -109,3 +109,5 @@ function Banner({text, onClose, onPress, containerStyles, textStyles, shouldRend
 Banner.displayName = 'Banner';
 
 export default memo(Banner);
+
+export type {BannerProps};
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 3abc5b17ae80..3b05d22fe6c4 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -352,3 +352,5 @@ function Button(
 Button.displayName = 'Button';
 
 export default withNavigationFallback(React.forwardRef(Button));
+
+export type {ButtonProps};
diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 21f3e9a3b605..f3293596aa46 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -15,7 +15,6 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useThrottledButtonState from '@hooks/useThrottledButtonState';
-import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import getButtonState from '@libs/getButtonState';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
@@ -58,7 +57,6 @@ function HeaderWithBackButton({
     children = null,
     shouldOverlayDots = false,
     shouldOverlay = false,
-    singleExecution = (func) => func,
     shouldNavigateToTopMostReport = false,
     style,
 }: HeaderWithBackButtonProps) {
@@ -68,7 +66,6 @@ function HeaderWithBackButton({
     const [isDownloadButtonActive, temporarilyDisableDownloadButton] = useThrottledButtonState();
     const {translate} = useLocalize();
     const {isKeyboardShown} = useKeyboardState();
-    const waitForNavigate = useWaitForNavigation();
 
     // If the icon is present, the header bar should be taller and use different font.
     const isCentralPaneSettings = !!icon;
@@ -175,7 +172,7 @@ function HeaderWithBackButton({
                         <Tooltip text={translate('getAssistancePage.questionMarkButtonTooltip')}>
                             <PressableWithoutFeedback
                                 disabled={shouldDisableGetAssistanceButton}
-                                onPress={singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.GET_ASSISTANCE.getRoute(guidesCallTaskID, Navigation.getActiveRoute()))))}
+                                onPress={() => Navigation.navigate(ROUTES.GET_ASSISTANCE.getRoute(guidesCallTaskID, Navigation.getActiveRoute()))}
                                 style={[styles.touchableButtonImage]}
                                 role="button"
                                 accessibilityLabel={translate('getAssistancePage.questionMarkButtonTooltip')}
diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx
index 03f1e0f496a8..1c337e024116 100644
--- a/src/components/Picker/BasePicker.tsx
+++ b/src/components/Picker/BasePicker.tsx
@@ -72,11 +72,11 @@ function BasePicker<TPickerValue>(
      */
     const onValueChange = (inputValue: TPickerValue, index: number) => {
         if (inputID) {
-            onInputChange(inputValue);
+            onInputChange?.(inputValue);
             return;
         }
 
-        onInputChange(inputValue, index);
+        onInputChange?.(inputValue, index);
     };
 
     const enableHighlight = () => {
diff --git a/src/components/Picker/types.ts b/src/components/Picker/types.ts
index 3f7c0282d35a..d935ebe8fdc5 100644
--- a/src/components/Picker/types.ts
+++ b/src/components/Picker/types.ts
@@ -80,7 +80,7 @@ type BasePickerProps<TPickerValue> = {
     shouldShowOnlyTextWhenDisabled?: boolean;
 
     /** A callback method that is called when the value changes and it receives the selected value as an argument */
-    onInputChange: (value: TPickerValue, index?: number) => void;
+    onInputChange?: (value: TPickerValue, index?: number) => void;
 
     /** Size of a picker component */
     size?: PickerSize;
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index 827eec8088a6..b78e274371ca 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -23,6 +23,7 @@ import KeyboardAvoidingView from './KeyboardAvoidingView';
 import OfflineIndicator from './OfflineIndicator';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import TestToolsModal from './TestToolsModal';
+import withNavigationFallback from './withNavigationFallback';
 
 type ChildrenProps = {
     insets: EdgeInsets;
@@ -279,4 +280,4 @@ function ScreenWrapper(
 
 ScreenWrapper.displayName = 'ScreenWrapper';
 
-export default forwardRef(ScreenWrapper);
+export default withNavigationFallback(forwardRef(ScreenWrapper));
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
index 0ea8ea308d6a..690a9485f099 100644
--- a/src/components/SettlementButton.tsx
+++ b/src/components/SettlementButton.tsx
@@ -143,9 +143,8 @@ function SettlementButton({
     const session = useSession();
     const chatReport = ReportUtils.getReport(chatReportID);
     const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicyExpenseChat(chatReport as OnyxEntry<Report>);
-    const shouldShowPaywithExpensifyOption =
-        !isPaidGroupPolicy ||
-        (!shouldHidePaymentOptions && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && policy?.reimburserEmail === session?.email);
+    const shouldShowPaywithExpensifyOption = !isPaidGroupPolicy || (!shouldHidePaymentOptions && ReportUtils.isPayer(session, iouReport as OnyxEntry<Report>));
+    const shouldShowPayElsewhereOption = !isPaidGroupPolicy || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
     const paymentButtonOptions = useMemo(() => {
         const buttonOptions = [];
         const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
@@ -189,7 +188,9 @@ function SettlementButton({
         if (isExpenseReport && shouldShowPaywithExpensifyOption) {
             buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.VBBA]);
         }
-        buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);
+        if (shouldShowPayElsewhereOption) {
+            buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);
+        }
 
         if (shouldShowApproveButton) {
             buttonOptions.push(approveButtonOption);
diff --git a/src/components/VideoPlayer/IconButton.js b/src/components/VideoPlayer/IconButton.js
index 71c1a2150692..5af9bc87e66f 100644
--- a/src/components/VideoPlayer/IconButton.js
+++ b/src/components/VideoPlayer/IconButton.js
@@ -1,8 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Hoverable from '@components/Hoverable';
 import Icon from '@components/Icon';
-import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Tooltip from '@components/Tooltip';
 import useThemeStyles from '@hooks/useThemeStyles';
 import stylePropTypes from '@styles/stylePropTypes';
@@ -44,21 +43,18 @@ function IconButton({src, fill, onPress, style, hoverStyle, tooltipText, small,
             text={tooltipText}
             shouldForceRenderingBelow={shouldForceRenderingTooltipBelow}
         >
-            <Hoverable>
-                {(isHovered) => (
-                    <PressableWithoutFeedback
-                        accessibilityLabel={tooltipText}
-                        onPress={onPress}
-                        style={[styles.videoIconButton, isHovered && [styles.videoIconButtonHovered, hoverStyle], style]}
-                    >
-                        <Icon
-                            src={src}
-                            fill={fill}
-                            small={small}
-                        />
-                    </PressableWithoutFeedback>
-                )}
-            </Hoverable>
+            <PressableWithFeedback
+                accessibilityLabel={tooltipText}
+                onPress={onPress}
+                style={[styles.videoIconButton, style]}
+                hoverStyle={[styles.videoIconButtonHovered, hoverStyle]}
+            >
+                <Icon
+                    src={src}
+                    fill={fill}
+                    small={small}
+                />
+            </PressableWithFeedback>
         </Tooltip>
     );
 }
diff --git a/src/components/VideoPlayerPreview/index.tsx b/src/components/VideoPlayerPreview/index.tsx
index a1e9568cc2ad..28415fa52837 100644
--- a/src/components/VideoPlayerPreview/index.tsx
+++ b/src/components/VideoPlayerPreview/index.tsx
@@ -7,6 +7,8 @@ import VideoPlayer from '@components/VideoPlayer';
 import IconButton from '@components/VideoPlayer/IconButton';
 import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
 import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useThumbnailDimensions from '@hooks/useThumbnailDimensions';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -39,6 +41,8 @@ type VideoPlayerPreviewProps = {
 
 function VideoPlayerPreview({videoUrl, thumbnailUrl, fileName, videoDimensions, videoDuration, onShowModalPress}: VideoPlayerPreviewProps) {
     const styles = useThemeStyles();
+    const theme = useTheme();
+    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {currentlyPlayingURL, updateCurrentlyPlayingURL} = usePlaybackContext();
     const {isSmallScreenWidth} = useWindowDimensions();
@@ -84,14 +88,16 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, fileName, videoDimensions,
                         shouldUseSmallVideoControls
                         style={[styles.w100, styles.h100]}
                     />
-
-                    <IconButton
-                        src={Expensicons.Expand}
-                        style={styles.videoExpandButton}
-                        tooltipText={translate('videoPlayer.expand')}
-                        onPress={onShowModalPress}
-                        small
-                    />
+                    <View style={[styles.pAbsolute, styles.w100]}>
+                        <IconButton
+                            src={Expensicons.Expand}
+                            style={[styles.videoExpandButton]}
+                            hoverStyle={StyleUtils.getBackgroundColorStyle(theme.videoPlayerBG)}
+                            tooltipText={translate('videoPlayer.expand')}
+                            onPress={onShowModalPress}
+                            small
+                        />
+                    </View>
                 </>
             )}
         </View>
diff --git a/src/libs/API/parameters/EnablePolicyTaxesParams.ts b/src/libs/API/parameters/EnablePolicyTaxesParams.ts
index 4a235d5d6a1f..5517bd442231 100644
--- a/src/libs/API/parameters/EnablePolicyTaxesParams.ts
+++ b/src/libs/API/parameters/EnablePolicyTaxesParams.ts
@@ -1,6 +1,7 @@
 type EnablePolicyTaxesParams = {
     policyID: string;
     enabled: boolean;
+    taxFields?: string;
 };
 
 export default EnablePolicyTaxesParams;
diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index 985499078c9a..9a7e0a568627 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -124,7 +124,8 @@ function getDistanceMerchant(
 
     const formattedDistance = getDistanceForDisplay(hasRoute, distanceInMeters, unit, rate, translate);
     const singularDistanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.mile') : translate('common.kilometer');
-    const ratePerUnit = PolicyUtils.getUnitRateValue({rate}, toLocaleDigit);
+    const ratePerUnit = PolicyUtils.getUnitRateValue(toLocaleDigit, {rate});
+
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const currencySymbol = CurrencyUtils.getCurrencySymbol(currency) || `${currency} `;
 
diff --git a/src/libs/ModifiedExpenseMessage.ts b/src/libs/ModifiedExpenseMessage.ts
index fad823a8fded..6c8070566d59 100644
--- a/src/libs/ModifiedExpenseMessage.ts
+++ b/src/libs/ModifiedExpenseMessage.ts
@@ -5,9 +5,9 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {PolicyTagList, Report, ReportAction} from '@src/types/onyx';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
+import getReportPolicyID from './getReportPolicyID';
 import * as Localize from './Localize';
 import * as PolicyUtils from './PolicyUtils';
-import * as ReportUtils from './ReportUtils';
 import type {ExpenseOriginalMessage} from './ReportUtils';
 import * as TransactionUtils from './TransactionUtils';
 
@@ -112,12 +112,12 @@ function getForDistanceRequest(newDistance: string, oldDistance: string, newAmou
  * ModifiedExpense::getNewDotComment in Web-Expensify should match this.
  * If we change this function be sure to update the backend as well.
  */
-function getForReportAction(reportID: string | undefined, reportAction: OnyxEntry<ReportAction>): string {
+function getForReportAction(reportID: string | undefined, reportAction: OnyxEntry<ReportAction> | ReportAction | Record<string, never>): string {
     if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
         return '';
     }
     const reportActionOriginalMessage = reportAction?.originalMessage as ExpenseOriginalMessage | undefined;
-    const policyID = ReportUtils.getReportPolicyID(reportID) ?? '';
+    const policyID = getReportPolicyID(reportID) ?? '';
 
     const removalFragments: string[] = [];
     const setFragments: string[] = [];
diff --git a/src/libs/PolicyDistanceRatesUtils.ts b/src/libs/PolicyDistanceRatesUtils.ts
index cdcfb13eeb72..edc5e51ceeb9 100644
--- a/src/libs/PolicyDistanceRatesUtils.ts
+++ b/src/libs/PolicyDistanceRatesUtils.ts
@@ -1,5 +1,7 @@
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
+import type {Rate} from '@src/types/onyx/Policy';
 import * as CurrencyUtils from './CurrencyUtils';
 import getPermittedDecimalSeparator from './getPermittedDecimalSeparator';
 import * as MoneyRequestUtils from './MoneyRequestUtils';
@@ -22,4 +24,13 @@ function validateRateValue(values: FormOnyxValues<RateValueForm>, currency: stri
     return errors;
 }
 
-export default validateRateValue;
+/**
+ * Get the optimistic rate name in a way that matches BE logic
+ * @param rates
+ */
+function getOptimisticRateName(rates: Record<string, Rate>): string {
+    const existingRatesWithSameName = Object.values(rates ?? {}).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));
+    return existingRatesWithSameName.length ? `${CONST.CUSTOM_UNITS.DEFAULT_RATE} ${existingRatesWithSameName.length}` : CONST.CUSTOM_UNITS.DEFAULT_RATE;
+}
+
+export {validateRateValue, getOptimisticRateName};
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 30c9ed935f7b..37439de5a6c3 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -5,13 +5,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
-import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {PolicyFeatureName, Rate} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import Navigation from './Navigation/Navigation';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
-type UnitRate = {rate: number};
 
 /**
  * Filter out the active policies, which will exclude policies with pending deletion
@@ -66,7 +65,7 @@ function hasCustomUnitsError(policy: OnyxEntry<Policy>): boolean {
     return Object.keys(policy?.customUnits?.errors ?? {}).length > 0;
 }
 
-function getNumericValue(value: number, toLocaleDigit: (arg: string) => string): number | string {
+function getNumericValue(value: number | string, toLocaleDigit: (arg: string) => string): number | string {
     const numValue = parseFloat(value.toString().replace(toLocaleDigit('.'), '.'));
     if (Number.isNaN(numValue)) {
         return NaN;
@@ -82,7 +81,7 @@ function getRateDisplayValue(value: number, toLocaleDigit: (arg: string) => stri
     return numValue.toString().replace('.', toLocaleDigit('.')).substring(0, value.toString().length);
 }
 
-function getUnitRateValue(customUnitRate: UnitRate, toLocaleDigit: (arg: string) => string) {
+function getUnitRateValue(toLocaleDigit: (arg: string) => string, customUnitRate?: Rate) {
     return getRateDisplayValue((customUnitRate?.rate ?? 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET, toLocaleDigit);
 }
 
@@ -244,7 +243,7 @@ function isTaxPolicyEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Poli
  * Note: Free policies have "instant" submit always enabled.
  */
 function isInstantSubmitEnabled(policy: OnyxEntry<Policy> | EmptyObject): boolean {
-    return policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT || policy?.type === CONST.POLICY.TYPE.FREE;
+    return policy?.type === CONST.POLICY.TYPE.FREE || (policy?.autoReporting === true && policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT);
 }
 
 /**
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 05701c3e321f..64bac4f46b5a 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -135,7 +135,7 @@ function isReportPreviewAction(reportAction: OnyxEntry<ReportAction>): boolean {
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW;
 }
 
-function isModifiedExpenseAction(reportAction: OnyxEntry<ReportAction>): boolean {
+function isModifiedExpenseAction(reportAction: OnyxEntry<ReportAction> | ReportAction | Record<string, never>): boolean {
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE;
 }
 
@@ -269,7 +269,9 @@ function getContinuousReportActionChain(sortedReportActions: ReportAction[], id?
     }
 
     if (index === -1) {
-        return [];
+        // if no non-pending action is found, that means all actions on the report are optimistic
+        // in this case, we'll assume the whole chain of reportActions is continuous and return it in its entirety
+        return id ? [] : sortedReportActions;
     }
 
     let startIndex = index;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6bbc2d2fdb0b..b655d751ddf7 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -55,11 +55,13 @@ import * as store from './actions/ReimbursementAccount/store';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
+import originalGetReportPolicyID from './getReportPolicyID';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import localeCompare from './LocaleCompare';
 import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as Localize from './Localize';
 import {isEmailPublicDomain} from './LoginUtils';
+import ModifiedExpenseMessage from './ModifiedExpenseMessage';
 import linkingConfig from './Navigation/linkingConfig';
 import Navigation from './Navigation/Navigation';
 import * as NumberUtils from './NumberUtils';
@@ -1292,7 +1294,7 @@ function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>) {
     if (isPaidGroupPolicy(iouReport)) {
         if (policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES) {
             const isReimburser = session?.email === policy?.reimburserEmail;
-            return isReimburser && (isApproved || isManager);
+            return (!policy?.reimburserEmail || isReimburser) && (isApproved || isManager);
         }
         if (policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL) {
             return isAdmin && (isApproved || isManager);
@@ -2795,6 +2797,9 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         if (parentReportActionMessage && isArchivedRoom(report)) {
             return `${parentReportActionMessage} (${Localize.translateLocal('common.archived')})`;
         }
+        if (ReportActionsUtils.isModifiedExpenseAction(parentReportAction)) {
+            return ModifiedExpenseMessage.getForReportAction(report?.reportID, parentReportAction);
+        }
         return parentReportActionMessage;
     }
 
@@ -4121,13 +4126,13 @@ function buildOptimisticTaskReport(
  * @param reportAction - the parent IOU report action from which to create the thread
  * @param moneyRequestReport - the report which the report action belongs to
  */
-function buildTransactionThread(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>, moneyRequestReport: Report): OptimisticChatReport {
+function buildTransactionThread(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>, moneyRequestReport: OnyxEntry<Report>): OptimisticChatReport {
     const participantAccountIDs = [...new Set([currentUserAccountID, Number(reportAction?.actorAccountID)])].filter(Boolean) as number[];
     return buildOptimisticChatReport(
         participantAccountIDs,
         getTransactionReportName(reportAction),
         undefined,
-        moneyRequestReport.policyID,
+        moneyRequestReport?.policyID,
         CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
         false,
         '',
@@ -4135,7 +4140,7 @@ function buildTransactionThread(reportAction: OnyxEntry<ReportAction | Optimisti
         undefined,
         CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
         reportAction?.reportActionID,
-        moneyRequestReport.reportID,
+        moneyRequestReport?.reportID,
     );
 }
 
@@ -4643,7 +4648,7 @@ function getReportIDFromLink(url: string | null): string {
  * Get the report policyID given a reportID
  */
 function getReportPolicyID(reportID?: string): string | undefined {
-    return getReport(reportID)?.policyID;
+    return originalGetReportPolicyID(reportID);
 }
 
 /**
@@ -5365,6 +5370,7 @@ function hasUpdatedTotal(report: OnyxEntry<Report>): boolean {
  * - The action is listed in the thread-disabled list
  * - The action is a split bill action
  * - The action is deleted and is not threaded
+ * - The report is archived and the action is not threaded
  * - The action is a whisper action and it's neither a report preview nor IOU action
  * - The action is the thread's first chat
  */
@@ -5374,11 +5380,13 @@ function shouldDisableThread(reportAction: OnyxEntry<ReportAction>, reportID: st
     const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
     const isIOUAction = ReportActionsUtils.isMoneyRequestAction(reportAction);
     const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
+    const isArchivedReport = isArchivedRoom(getReport(reportID));
 
     return (
         CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName) ||
         isSplitBillAction ||
         (isDeletedAction && !reportAction?.childVisibleActionCount) ||
+        (isArchivedReport && !reportAction?.childVisibleActionCount) ||
         (isWhisperAction && !isReportPreviewAction && !isIOUAction) ||
         isThreadFirstChat(reportAction, reportID)
     );
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index a789b3332c4c..17d9a20e4bb1 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -4517,30 +4517,6 @@ function sendMoneyWithWallet(report: OnyxTypes.Report, amount: number, currency:
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, policy: OnyxEntry<OnyxTypes.Policy> | EmptyObject) {
-    const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
-    const iouCanceled = ReportUtils.isArchivedRoom(chatReport);
-
-    if (isEmptyObject(iouReport)) {
-        return false;
-    }
-
-    const isPayer = ReportUtils.isPayer(
-        {
-            email: currentUserEmail,
-            accountID: userAccountID,
-        },
-        iouReport,
-    );
-
-    const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
-    const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
-
-    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(iouReport);
-    const isAutoReimbursable = ReportUtils.canBeAutoReimbursed(iouReport, policy);
-    return isPayer && !isOpenExpenseReport && !iouSettled && !iouReport?.isWaitingOnBankAccount && reimbursableSpend !== 0 && !iouCanceled && !isAutoReimbursable;
-}
-
 function canApproveIOU(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, policy: OnyxEntry<OnyxTypes.Policy> | EmptyObject) {
     if (isEmptyObject(chatReport)) {
         return false;
@@ -4567,6 +4543,36 @@ function canApproveIOU(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, cha
     return isCurrentUserManager && !isOpenExpenseReport && !isApproved && !iouSettled;
 }
 
+function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, policy: OnyxEntry<OnyxTypes.Policy> | EmptyObject) {
+    const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
+    const iouCanceled = ReportUtils.isArchivedRoom(chatReport);
+
+    if (isEmptyObject(iouReport)) {
+        return false;
+    }
+
+    if (policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO) {
+        return false;
+    }
+
+    const isPayer = ReportUtils.isPayer(
+        {
+            email: currentUserEmail,
+            accountID: userAccountID,
+        },
+        iouReport,
+    );
+
+    const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
+    const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
+
+    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(iouReport);
+    const isAutoReimbursable = policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES ? false : ReportUtils.canBeAutoReimbursed(iouReport, policy);
+    const shouldBeApproved = canApproveIOU(iouReport, chatReport, policy);
+
+    return isPayer && !isOpenExpenseReport && !iouSettled && !iouReport?.isWaitingOnBankAccount && reimbursableSpend !== 0 && !iouCanceled && !isAutoReimbursable && !shouldBeApproved;
+}
+
 function hasIOUToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, excludedIOUReportID: string): boolean {
     const chatReportActions = ReportActionsUtils.getAllReportActions(chatReport?.reportID ?? '');
 
diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts
index ae95424f5776..c83c946aed46 100644
--- a/src/libs/actions/Link.ts
+++ b/src/libs/actions/Link.ts
@@ -10,6 +10,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
+import * as Session from './Session';
 
 let isNetworkOffline = false;
 Onyx.connect({
@@ -102,6 +103,10 @@ function openLink(href: string, environmentURL: string, isAttachment = false) {
     // If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation
     // instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
     if (internalNewExpensifyPath && hasSameOrigin) {
+        if (Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(internalNewExpensifyPath)) {
+            Session.signOutAndRedirectToSignIn();
+            return;
+        }
         Navigation.navigate(internalNewExpensifyPath as Route);
         return;
     }
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 580898a2f869..ef5a09483c67 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -83,6 +83,7 @@ import type {
     ReimbursementAccount,
     Report,
     ReportAction,
+    TaxRatesWithDefault,
     Transaction,
 } from '@src/types/onyx';
 import type {ErrorFields, Errors, OnyxValueWithOfflineFeedback, PendingAction} from '@src/types/onyx/OnyxCommon';
@@ -3669,6 +3670,62 @@ function enablePolicyTags(policyID: string, enabled: boolean) {
 }
 
 function enablePolicyTaxes(policyID: string, enabled: boolean) {
+    const defaultTaxRates: TaxRatesWithDefault = CONST.DEFAULT_TAX;
+    const taxRatesData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        ...defaultTaxRates,
+                        taxes: {
+                            ...Object.keys(defaultTaxRates.taxes).reduce(
+                                (prevTaxesData, taxKey) => ({
+                                    ...prevTaxesData,
+                                    [taxKey]: {
+                                        ...defaultTaxRates.taxes[taxKey],
+                                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                                    },
+                                }),
+                                {},
+                            ),
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            ...Object.keys(defaultTaxRates.taxes).reduce(
+                                (prevTaxesData, taxKey) => ({
+                                    ...prevTaxesData,
+                                    [taxKey]: {pendingAction: null},
+                                }),
+                                {},
+                            ),
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: undefined,
+                },
+            },
+        ],
+    };
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const shouldAddDefaultTaxRatesData = (!policy?.taxRates || isEmptyObject(policy.taxRates)) && enabled;
     const onyxData: OnyxData = {
         optimisticData: [
             {
@@ -3683,6 +3740,7 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) {
                     },
                 },
             },
+            ...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []),
         ],
         successData: [
             {
@@ -3694,6 +3752,7 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) {
                     },
                 },
             },
+            ...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []),
         ],
         failureData: [
             {
@@ -3708,11 +3767,14 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) {
                     },
                 },
             },
+            ...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []),
         ],
     };
 
     const parameters: EnablePolicyTaxesParams = {policyID, enabled};
-
+    if (shouldAddDefaultTaxRatesData) {
+        parameters.taxFields = JSON.stringify(defaultTaxRates);
+    }
     API.write(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData);
 
     if (enabled) {
@@ -4623,3 +4685,5 @@ export {
     setPolicyDistanceRatesEnabled,
     deletePolicyDistanceRates,
 };
+
+export type {NewCustomUnit};
diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
index aad6ae39810a..72d1fe9fe63d 100644
--- a/src/libs/actions/ReportActions.ts
+++ b/src/libs/actions/ReportActions.ts
@@ -1,4 +1,5 @@
 import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import * as ReportActionUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
@@ -6,10 +7,10 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import * as Report from './Report';
 
-function clearReportActionErrors(reportID: string, reportAction: ReportAction) {
+function clearReportActionErrors(reportID: string, reportAction: OnyxEntry<ReportAction>) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
 
-    if (!reportAction.reportActionID) {
+    if (!reportAction?.reportActionID) {
         return;
     }
 
diff --git a/src/libs/getReportPolicyID.ts b/src/libs/getReportPolicyID.ts
new file mode 100644
index 000000000000..12124f24fbe7
--- /dev/null
+++ b/src/libs/getReportPolicyID.ts
@@ -0,0 +1,33 @@
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+import type {EmptyObject} from '@src/types/utils/EmptyObject';
+
+let allReports: OnyxCollection<Report>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT,
+    waitForCollectionCallback: true,
+    callback: (value) => (allReports = value),
+});
+
+/**
+ * Get the report given a reportID
+ */
+function getReport(reportID: string | undefined): OnyxEntry<Report> | EmptyObject {
+    if (!allReports) {
+        return {};
+    }
+
+    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? {};
+}
+
+/**
+ * Get the report policyID given a reportID.
+ * We need to define this method in a separate file to avoid cyclic dependency.
+ */
+function getReportPolicyID(reportID?: string): string | undefined {
+    return getReport(reportID)?.policyID;
+}
+
+export default getReportPolicyID;
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 242602b0654c..9bc0c4c3a4a8 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -234,7 +234,7 @@ function ReportScreen({
 
     const prevReport = usePrevious(report);
     const prevUserLeavingStatus = usePrevious(userLeavingStatus);
-    const [isLinkingToMessage, setLinkingToMessage] = useState(!!reportActionIDFromRoute);
+    const [isLinkingToMessage, setIsLinkingToMessage] = useState(!!reportActionIDFromRoute);
     const reportActions = useMemo(() => {
         if (!sortedAllReportActions.length) {
             return [];
@@ -243,9 +243,11 @@ function ReportScreen({
         return currentRangeOfReportActions;
     }, [reportActionIDFromRoute, sortedAllReportActions]);
 
-    // Define here because reportActions are recalculated before mount, allowing data to display faster than useEffect can trigger. If we have cached reportActions, they will be shown immediately. We aim to display a loader first, then fetch relevant reportActions, and finally show them.
+    // Define here because reportActions are recalculated before mount, allowing data to display faster than useEffect can trigger.
+    // If we have cached reportActions, they will be shown immediately.
+    // We aim to display a loader first, then fetch relevant reportActions, and finally show them.
     useLayoutEffect(() => {
-        setLinkingToMessage(!!reportActionIDFromRoute);
+        setIsLinkingToMessage(!!reportActionIDFromRoute);
     }, [route, reportActionIDFromRoute]);
 
     const [isBannerVisible, setIsBannerVisible] = useState(true);
@@ -261,15 +263,12 @@ function ReportScreen({
     const {reportPendingAction, reportErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
     const screenWrapperStyle: ViewStyle[] = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];
     const isEmptyChat = useMemo((): boolean => reportActions.length === 0, [reportActions]);
-    // There are no reportActions at all to display and we are still in the process of loading the next set of actions.
-    const isLoadingInitialReportActions = reportActions.length === 0 && !!reportMetadata?.isLoadingInitialReportActions;
     const isOptimisticDelete = report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
 
     // If there's a non-404 error for the report we should show it instead of blocking the screen
     const hasHelpfulErrors = Object.keys(report?.errorFields ?? {}).some((key) => key !== 'notFound');
     const shouldHideReport = !hasHelpfulErrors && !ReportUtils.canAccessReport(report, policies, betas);
 
-    const isLoading = !reportIDFromRoute || !isSidebarLoaded || PersonalDetailsUtils.isPersonalDetailsEmpty();
     const lastReportAction: OnyxEntry<OnyxTypes.ReportAction> = useMemo(
         () =>
             reportActions.length
@@ -325,16 +324,34 @@ function ReportScreen({
     /**
      * When false the ReportActionsView will completely unmount and we will show a loader until it returns true.
      */
-    const isReportReadyForDisplay = useMemo((): boolean => {
+    const isCurrentReportLoadedFromOnyx = useMemo((): boolean => {
         // This is necessary so that when we are retrieving the next report data from Onyx the ReportActionsView will remount completely
         const isTransitioning = report && report.reportID !== reportIDFromRoute;
         return reportIDFromRoute !== '' && !!report.reportID && !isTransitioning;
     }, [report, reportIDFromRoute]);
 
+    const isLoading = !ReportUtils.isValidReportIDFromPath(reportIDFromRoute) || !isSidebarLoaded || PersonalDetailsUtils.isPersonalDetailsEmpty();
     const shouldShowSkeleton =
-        isLinkingToMessage || !isReportReadyForDisplay || isLoadingInitialReportActions || isLoading || (!!reportActionIDFromRoute && reportMetadata?.isLoadingInitialReportActions);
-
-    const shouldShowReportActionList = isReportReadyForDisplay && !isLoading;
+        isLinkingToMessage ||
+        !isCurrentReportLoadedFromOnyx ||
+        (reportActions.length === 0 && !!reportMetadata?.isLoadingInitialReportActions) ||
+        isLoading ||
+        (!!reportActionIDFromRoute && reportMetadata?.isLoadingInitialReportActions);
+    const shouldShowReportActionList = isCurrentReportLoadedFromOnyx && !isLoading;
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useMemo(
+        (): boolean =>
+            !shouldShowSkeleton &&
+            ((!wasReportAccessibleRef.current &&
+                !firstRenderRef.current &&
+                !report.reportID &&
+                !isOptimisticDelete &&
+                !reportMetadata?.isLoadingInitialReportActions &&
+                !userLeavingStatus) ||
+                shouldHideReport ||
+                (!!reportIDFromRoute && !ReportUtils.isValidReportIDFromPath(reportIDFromRoute))),
+        [shouldShowSkeleton, report.reportID, isOptimisticDelete, reportMetadata?.isLoadingInitialReportActions, userLeavingStatus, shouldHideReport, reportIDFromRoute],
+    );
 
     const fetchReport = useCallback(() => {
         Report.openReport(reportIDFromRoute, reportActionIDFromRoute);
@@ -399,7 +416,7 @@ function ReportScreen({
         });
         return () => {
             interactionTask.cancel();
-            if (!didSubscribeToReportLeavingEvents) {
+            if (!didSubscribeToReportLeavingEvents.current) {
                 return;
             }
 
@@ -490,6 +507,10 @@ function ReportScreen({
         if (!ReportUtils.isValidReportIDFromPath(reportIDFromRoute)) {
             return;
         }
+        // Ensures the optimistic report is created successfully
+        if (reportIDFromRoute !== report.reportID) {
+            return;
+        }
         // Ensures subscription event succeeds when the report/workspace room is created optimistically.
         // Check if the optimistic `OpenReport` or `AddWorkspaceRoom` has succeeded by confirming
         // any `pendingFields.createChat` or `pendingFields.addWorkspaceRoom` fields are set to null.
@@ -520,34 +541,19 @@ function ReportScreen({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = useMemo(
-        (): boolean =>
-            (!wasReportAccessibleRef.current &&
-                !firstRenderRef.current &&
-                !report.reportID &&
-                !isOptimisticDelete &&
-                !reportMetadata?.isLoadingInitialReportActions &&
-                !isLoading &&
-                !userLeavingStatus) ||
-            shouldHideReport ||
-            (!!reportIDFromRoute && !ReportUtils.isValidReportIDFromPath(reportIDFromRoute)),
-        [report, reportMetadata, isLoading, shouldHideReport, isOptimisticDelete, userLeavingStatus, reportIDFromRoute],
-    );
-
     const actionListValue = useMemo((): ActionListContextType => ({flatListRef, scrollPosition, setScrollPosition}), [flatListRef, scrollPosition, setScrollPosition]);
 
     // This helps in tracking from the moment 'route' triggers useMemo until isLoadingInitialReportActions becomes true. It prevents blinking when loading reportActions from cache.
     useEffect(() => {
         InteractionManager.runAfterInteractions(() => {
-            setLinkingToMessage(false);
+            setIsLinkingToMessage(false);
         });
     }, [reportMetadata?.isLoadingInitialReportActions]);
 
-    const onLinkPress = () => {
+    const navigateToEndOfReport = useCallback(() => {
         Navigation.setParams({reportActionID: ''});
         fetchReport();
-    };
+    }, [fetchReport]);
 
     const isLinkedReportActionDeleted = useMemo(() => {
         if (!reportActionIDFromRoute || !sortedAllReportActions) {
@@ -566,7 +572,7 @@ function ReportScreen({
                 title={translate('notFound.notHere')}
                 shouldShowLink
                 linkKey="notFound.noAccess"
-                onLinkPress={onLinkPress}
+                onLinkPress={navigateToEndOfReport}
             />
         );
     }
@@ -614,7 +620,7 @@ function ReportScreen({
                                 shouldShowCloseButton
                             />
                         )}
-                        <DragAndDropProvider isDisabled={!isReportReadyForDisplay || !ReportUtils.canUserPerformWriteAction(report)}>
+                        <DragAndDropProvider isDisabled={!isCurrentReportLoadedFromOnyx || !ReportUtils.canUserPerformWriteAction(report)}>
                             <View
                                 style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
                                 onLayout={onListLayout}
@@ -636,7 +642,7 @@ function ReportScreen({
                                     we'll unnecessarily unmount the ReportActionsView which will clear the new marker lines initial state. */}
                                 {shouldShowSkeleton && <ReportActionsSkeletonView />}
 
-                                {isReportReadyForDisplay ? (
+                                {isCurrentReportLoadedFromOnyx ? (
                                     <ReportFooter
                                         report={report}
                                         pendingAction={reportPendingAction}
diff --git a/src/pages/home/report/AnimatedEmptyStateBackground.tsx b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
index c2ae6ddeb54c..4199ebe5937f 100644
--- a/src/pages/home/report/AnimatedEmptyStateBackground.tsx
+++ b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
@@ -6,13 +6,14 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 
-const IMAGE_OFFSET_Y = 75;
+// Maximum horizontal and vertical shift in pixels on sensor value change
+const IMAGE_OFFSET_X = 30;
+const IMAGE_OFFSET_Y = 20;
 
 function AnimatedEmptyStateBackground() {
     const StyleUtils = useStyleUtils();
     const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
     const illustrations = useThemeIllustrations();
-    const IMAGE_OFFSET_X = windowWidth / 2;
 
     // If window width is greater than the max background width, repeat the background image
     const maxBackgroundWidth = variables.sideBarWidth + CONST.EMPTY_STATE_BACKGROUND.ASPECT_RATIO * CONST.EMPTY_STATE_BACKGROUND.WIDE_SCREEN.IMAGE_HEIGHT;
@@ -37,7 +38,9 @@ function AnimatedEmptyStateBackground() {
         xOffset.value = clamp(xOffset.value + y * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_X, IMAGE_OFFSET_X);
         yOffset.value = clamp(yOffset.value - x * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_Y, IMAGE_OFFSET_Y);
         return {
-            transform: [{translateX: withSpring(-IMAGE_OFFSET_X - xOffset.value)}, {translateY: withSpring(yOffset.value)}],
+            // On Android, scroll view sub views gets clipped beyond container bounds. Set the top position so that image wouldn't get clipped
+            top: IMAGE_OFFSET_Y,
+            transform: [{translateX: withSpring(xOffset.value)}, {translateY: withSpring(yOffset.value, {overshootClamping: true})}, {scale: 1.15}],
         };
     }, [isReducedMotionEnabled]);
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 0e8b0cf97d1e..cdec6945d302 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -678,7 +678,7 @@ function ReportActionItem({
                     message = 'parentReportAction.deletedRequest';
                 }
                 return (
-                    <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true), styles.justifyContentEnd]}>
+                    <View>
                         <AnimatedEmptyStateBackground />
                         <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                             <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction ?? null}>
@@ -707,7 +707,7 @@ function ReportActionItem({
         if (ReportUtils.isTaskReport(report)) {
             if (ReportUtils.isCanceledTaskReport(report, parentReportAction)) {
                 return (
-                    <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
+                    <View>
                         <AnimatedEmptyStateBackground />
                         <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                             <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction}>
@@ -725,7 +725,7 @@ function ReportActionItem({
                 );
             }
             return (
-                <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true)]}>
+                <View>
                     <AnimatedEmptyStateBackground />
                     <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                         <TaskView
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index fbf2da69aa31..b5c18976aa86 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -17,6 +17,7 @@ import Tooltip from '@components/Tooltip';
 import useHandleExceedMaxCommentLength from '@hooks/useHandleExceedMaxCommentLength';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
+import usePrevious from '@hooks/usePrevious';
 import useReportScrollManager from '@hooks/useReportScrollManager';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -79,6 +80,7 @@ function ReportActionItemMessageEdit(
     const {translate, preferredLocale} = useLocalize();
     const {isKeyboardShown} = useKeyboardState();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const prevDraftMessage = usePrevious(draftMessage);
 
     const getInitialDraft = () => {
         if (draftMessage === action?.message?.[0].html) {
@@ -124,11 +126,11 @@ function ReportActionItemMessageEdit(
     const draftRef = useRef(draft);
 
     useEffect(() => {
-        if (ReportActionsUtils.isDeletedAction(action) || (action.message && draftMessage === action.message[0].html)) {
+        if (ReportActionsUtils.isDeletedAction(action) || Boolean(action.message && draftMessage === action.message[0].html) || Boolean(prevDraftMessage === draftMessage)) {
             return;
         }
         setDraft(Str.htmlDecode(draftMessage));
-    }, [draftMessage, action]);
+    }, [draftMessage, action, prevDraftMessage]);
 
     useEffect(() => {
         // required for keeping last state of isFocused variable
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index c74bb40a18b6..68cd069608da 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -264,6 +264,10 @@ function ReportActionsView({
     }, [isSmallScreenWidth, reportActions, isReportFullyVisible]);
 
     useEffect(() => {
+        // Ensures the optimistic report is created successfully
+        if (route?.params?.reportID !== reportID) {
+            return;
+        }
         // Ensures subscription event succeeds when the report/workspace room is created optimistically.
         // Check if the optimistic `OpenReport` or `AddWorkspaceRoom` has succeeded by confirming
         // any `pendingFields.createChat` or `pendingFields.addWorkspaceRoom` fields are set to null.
@@ -278,7 +282,7 @@ function ReportActionsView({
                 interactionTask.cancel();
             };
         }
-    }, [report.pendingFields, didSubscribeToReportTypingEvents, reportID]);
+    }, [report.pendingFields, didSubscribeToReportTypingEvents, route, reportID]);
 
     const onContentSizeChange = useCallback((w: number, h: number) => {
         contentListHeight.current = h;
diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index d8b407d5cee9..662335d0b358 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -12,7 +12,6 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import Text from '@components/Text';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
@@ -119,133 +118,131 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
             icon={Illustrations.House}
         >
             {(hasVBA?: boolean) => (
-                <ScrollView>
-                    <View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
-                        <Section
-                            isCentralPane
-                            title=""
-                        >
-                            <Image
-                                style={StyleSheet.flatten([styles.wAuto, styles.h68, imageStyle])}
-                                source={illustrations.WorkspaceProfile}
-                                resizeMode="cover"
-                            />
-                            <AvatarWithImagePicker
-                                onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))}
-                                source={policy?.avatar ?? ''}
-                                size={CONST.AVATAR_SIZE.XLARGE}
-                                avatarStyle={styles.avatarXLarge}
-                                enablePreview
-                                DefaultAvatar={DefaultAvatar}
-                                type={CONST.ICON_TYPE_WORKSPACE}
-                                fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
-                                style={[
-                                    policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,
-                                    isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
-                                    styles.alignItemsStart,
-                                    styles.sectionMenuItemTopDescription,
-                                ]}
-                                editIconStyle={styles.smallEditIconWorkspace}
-                                isUsingDefaultAvatar={!policy?.avatar ?? null}
-                                onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)}
-                                onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')}
-                                editorMaskImage={Expensicons.ImageCropSquareMask}
-                                pendingAction={policy?.pendingFields?.avatar}
-                                errors={policy?.errorFields?.avatar}
-                                onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')}
-                                previewSource={UserUtils.getFullSizeAvatar(policy?.avatar ?? '')}
-                                headerTitle={translate('workspace.common.workspaceAvatar')}
-                                originalFileName={policy?.originalFileName}
+                <View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <Section
+                        isCentralPane
+                        title=""
+                    >
+                        <Image
+                            style={StyleSheet.flatten([styles.wAuto, styles.h68, imageStyle])}
+                            source={illustrations.WorkspaceProfile}
+                            resizeMode="cover"
+                        />
+                        <AvatarWithImagePicker
+                            onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))}
+                            source={policy?.avatar ?? ''}
+                            size={CONST.AVATAR_SIZE.XLARGE}
+                            avatarStyle={styles.avatarXLarge}
+                            enablePreview
+                            DefaultAvatar={DefaultAvatar}
+                            type={CONST.ICON_TYPE_WORKSPACE}
+                            fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
+                            style={[
+                                policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,
+                                isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
+                                styles.alignItemsStart,
+                                styles.sectionMenuItemTopDescription,
+                            ]}
+                            editIconStyle={styles.smallEditIconWorkspace}
+                            isUsingDefaultAvatar={!policy?.avatar ?? null}
+                            onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)}
+                            onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')}
+                            editorMaskImage={Expensicons.ImageCropSquareMask}
+                            pendingAction={policy?.pendingFields?.avatar}
+                            errors={policy?.errorFields?.avatar}
+                            onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')}
+                            previewSource={UserUtils.getFullSizeAvatar(policy?.avatar ?? '')}
+                            headerTitle={translate('workspace.common.workspaceAvatar')}
+                            originalFileName={policy?.originalFileName}
+                            disabled={readOnly}
+                            disabledStyle={styles.cursorDefault}
+                            errorRowStyles={styles.mt3}
+                        />
+                        <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                            <MenuItemWithTopDescription
+                                title={policyName}
+                                titleStyle={styles.workspaceTitleStyle}
+                                description={translate('workspace.editor.nameInputLabel')}
+                                shouldShowRightIcon={!readOnly}
                                 disabled={readOnly}
-                                disabledStyle={styles.cursorDefault}
-                                errorRowStyles={styles.mt3}
+                                wrapperStyle={[styles.sectionMenuItemTopDescription, isSmallScreenWidth ? styles.mt3 : {}]}
+                                onPress={onPressName}
+                                shouldGreyOutWhenDisabled={false}
+                                shouldUseDefaultCursorWhenDisabled
                             />
-                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                        </OfflineWithFeedback>
+                        {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && (
+                            <OfflineWithFeedback
+                                pendingAction={policy?.pendingFields?.description}
+                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                            >
                                 <MenuItemWithTopDescription
-                                    title={policyName}
-                                    titleStyle={styles.workspaceTitleStyle}
-                                    description={translate('workspace.editor.nameInputLabel')}
+                                    title={policyDescription}
+                                    description={translate('workspace.editor.descriptionInputLabel')}
                                     shouldShowRightIcon={!readOnly}
                                     disabled={readOnly}
-                                    wrapperStyle={[styles.sectionMenuItemTopDescription, isSmallScreenWidth ? styles.mt3 : {}]}
-                                    onPress={onPressName}
+                                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                                    onPress={onPressDescription}
                                     shouldGreyOutWhenDisabled={false}
                                     shouldUseDefaultCursorWhenDisabled
+                                    shouldRenderAsHTML
                                 />
                             </OfflineWithFeedback>
-                            {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && (
-                                <OfflineWithFeedback
-                                    pendingAction={policy?.pendingFields?.description}
-                                    errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
-                                    onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
-                                >
-                                    <MenuItemWithTopDescription
-                                        title={policyDescription}
-                                        description={translate('workspace.editor.descriptionInputLabel')}
-                                        shouldShowRightIcon={!readOnly}
-                                        disabled={readOnly}
-                                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                                        onPress={onPressDescription}
-                                        shouldGreyOutWhenDisabled={false}
-                                        shouldUseDefaultCursorWhenDisabled
-                                        shouldRenderAsHTML
-                                    />
-                                </OfflineWithFeedback>
-                            )}
-                            <OfflineWithFeedback
-                                pendingAction={policy?.pendingFields?.generalSettings}
-                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
-                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
-                                errorRowStyles={[styles.mt2]}
-                            >
-                                <View>
-                                    <MenuItemWithTopDescription
-                                        title={formattedCurrency}
-                                        description={translate('workspace.editor.currencyInputLabel')}
-                                        shouldShowRightIcon={!readOnly}
-                                        disabled={hasVBA ? true : readOnly}
-                                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                                        onPress={onPressCurrency}
-                                        shouldGreyOutWhenDisabled={false}
-                                        shouldUseDefaultCursorWhenDisabled
-                                    />
-                                    <Text style={[styles.textLabel, styles.colorMuted, styles.mt1, styles.mh5, styles.sectionMenuItemTopDescription]}>
-                                        {hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
-                                    </Text>
-                                </View>
-                            </OfflineWithFeedback>
-                            {!readOnly && (
-                                <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
-                                    <Button
-                                        accessibilityLabel={translate('common.share')}
-                                        text={translate('common.share')}
-                                        onPress={onPressShare}
-                                        medium
-                                        icon={Expensicons.QrCode}
-                                    />
-                                    <Button
-                                        accessibilityLabel={translate('common.delete')}
-                                        text={translate('common.delete')}
-                                        style={[styles.ml2]}
-                                        onPress={() => setIsDeleteModalOpen(true)}
-                                        medium
-                                        icon={Expensicons.Trashcan}
-                                    />
-                                </View>
-                            )}
-                        </Section>
-                        <ConfirmModal
-                            title={translate('common.delete')}
-                            isVisible={isDeleteModalOpen}
-                            onConfirm={confirmDeleteAndHideModal}
-                            onCancel={() => setIsDeleteModalOpen(false)}
-                            prompt={translate('workspace.common.deleteConfirmation')}
-                            confirmText={translate('common.delete')}
-                            cancelText={translate('common.cancel')}
-                            danger
-                        />
-                    </View>
-                </ScrollView>
+                        )}
+                        <OfflineWithFeedback
+                            pendingAction={policy?.pendingFields?.generalSettings}
+                            errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                            errorRowStyles={[styles.mt2]}
+                        >
+                            <View>
+                                <MenuItemWithTopDescription
+                                    title={formattedCurrency}
+                                    description={translate('workspace.editor.currencyInputLabel')}
+                                    shouldShowRightIcon={!readOnly}
+                                    disabled={hasVBA ? true : readOnly}
+                                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                                    onPress={onPressCurrency}
+                                    shouldGreyOutWhenDisabled={false}
+                                    shouldUseDefaultCursorWhenDisabled
+                                />
+                                <Text style={[styles.textLabel, styles.colorMuted, styles.mt1, styles.mh5, styles.sectionMenuItemTopDescription]}>
+                                    {hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
+                                </Text>
+                            </View>
+                        </OfflineWithFeedback>
+                        {!readOnly && (
+                            <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
+                                <Button
+                                    accessibilityLabel={translate('common.share')}
+                                    text={translate('common.share')}
+                                    onPress={onPressShare}
+                                    medium
+                                    icon={Expensicons.QrCode}
+                                />
+                                <Button
+                                    accessibilityLabel={translate('common.delete')}
+                                    text={translate('common.delete')}
+                                    style={[styles.ml2]}
+                                    onPress={() => setIsDeleteModalOpen(true)}
+                                    medium
+                                    icon={Expensicons.Trashcan}
+                                />
+                            </View>
+                        )}
+                    </Section>
+                    <ConfirmModal
+                        title={translate('common.delete')}
+                        isVisible={isDeleteModalOpen}
+                        onConfirm={confirmDeleteAndHideModal}
+                        onCancel={() => setIsDeleteModalOpen(false)}
+                        prompt={translate('workspace.common.deleteConfirmation')}
+                        confirmText={translate('common.delete')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                    />
+                </View>
             )}
         </WorkspacePageWithSections>
     );
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index f3456c3875f5..46afcd624350 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -273,6 +273,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
                         style={[styles.defaultModalContainer]}
                         testID={WorkspaceCategoriesPage.displayName}
                         shouldShowOfflineIndicatorInWideScreen
+                        offlineIndicatorStyle={styles.mtAuto}
                     >
                         <HeaderWithBackButton
                             icon={Illustrations.FolderOpen}
@@ -309,7 +310,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
                                 subtitle={translate('workspace.categories.emptyCategories.subtitle')}
                             />
                         )}
-                        {!shouldShowEmptyState && (
+                        {!shouldShowEmptyState && !isLoading && (
                             <SelectionList
                                 canSelectMultiple
                                 sections={[{data: categoryList, indexOffset: 0, isDisabled: false}]}
diff --git a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
index 0a361f3f8e85..1d01856992f9 100644
--- a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
+++ b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
@@ -11,7 +11,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import validateRateValue from '@libs/PolicyDistanceRatesUtils';
+import {getOptimisticRateName, validateRateValue} from '@libs/PolicyDistanceRatesUtils';
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
@@ -49,7 +49,7 @@ function CreateDistanceRatePage({policy, route}: CreateDistanceRatePageProps) {
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM>) => {
         const newRate: Rate = {
             currency,
-            name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
+            name: getOptimisticRateName(customUnits[customUnitID]?.rates),
             rate: parseFloat(values.rate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
             customUnitRateID,
             enabled: true,
@@ -70,6 +70,7 @@ function CreateDistanceRatePage({policy, route}: CreateDistanceRatePageProps) {
                         includeSafeAreaPaddingBottom={false}
                         style={[styles.defaultModalContainer]}
                         testID={CreateDistanceRatePage.displayName}
+                        shouldEnableMaxHeight
                     >
                         <HeaderWithBackButton title={translate('workspace.distanceRates.addRate')} />
                         <FormProvider
@@ -82,6 +83,7 @@ function CreateDistanceRatePage({policy, route}: CreateDistanceRatePageProps) {
                             shouldHideFixErrorsAlert
                             submitFlexEnabled={false}
                             submitButtonStyles={[styles.mh5, styles.mt0]}
+                            disablePressOnEnter={false}
                         >
                             <InputWrapperWithRef
                                 InputComponent={AmountForm}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
index be85ee680d36..16687e3fb299 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
@@ -13,7 +13,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import validateRateValue from '@libs/PolicyDistanceRatesUtils';
+import {validateRateValue} from '@libs/PolicyDistanceRatesUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 93accdb10b28..6533d79e03b9 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -179,10 +179,12 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     };
 
     const toggleAllRates = () => {
-        if (selectedDistanceRates.length === Object.values(customUnitRates).length) {
+        const allSelectableRates = Object.values(customUnitRates).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+        if (selectedDistanceRates.length === allSelectableRates.length) {
             setSelectedDistanceRates([]);
         } else {
-            setSelectedDistanceRates([...Object.values(customUnitRates).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)]);
+            setSelectedDistanceRates([...allSelectableRates]);
         }
     };
 
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx
new file mode 100644
index 000000000000..8fef5f4dc6f9
--- /dev/null
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx
@@ -0,0 +1,158 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useEffect} from 'react';
+import {Keyboard, View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Picker from '@components/Picker';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import getPermittedDecimalSeparator from '@libs/getPermittedDecimalSeparator';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as NumberUtils from '@libs/NumberUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import withPolicy from '@pages/workspace/withPolicy';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+import * as BankAccounts from '@userActions/BankAccounts';
+import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Unit} from '@src/types/onyx/Policy';
+
+type WorkspaceRateAndUnitPageProps = WithPolicyProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RATE_AND_UNIT>;
+
+type ValidationError = {rate?: TranslationPaths | undefined};
+
+function WorkspaceRateAndUnitPage({policy, route}: WorkspaceRateAndUnitPageProps) {
+    const {translate, toLocaleDigit} = useLocalize();
+    const styles = useThemeStyles();
+
+    useEffect(() => {
+        if ((policy?.customUnits ?? []).length !== 0) {
+            return;
+        }
+
+        BankAccounts.setReimbursementAccountLoading(true);
+        Policy.openWorkspaceReimburseView(policy?.id ?? '');
+    }, [policy?.customUnits, policy?.id]);
+
+    const unitItems = [
+        {label: translate('common.kilometers'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS},
+        {label: translate('common.miles'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
+    ];
+
+    const saveUnitAndRate = (unit: Unit, rate: string) => {
+        const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((customUnit) => customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+        if (!distanceCustomUnit) {
+            return;
+        }
+        const currentCustomUnitRate = Object.values(distanceCustomUnit?.rates ?? {}).find((r) => r.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+        const unitID = distanceCustomUnit.customUnitID ?? '';
+        const unitName = distanceCustomUnit.name ?? '';
+        const rateNumValue = PolicyUtils.getNumericValue(rate, toLocaleDigit);
+
+        const newCustomUnit: Policy.NewCustomUnit = {
+            customUnitID: unitID,
+            name: unitName,
+            attributes: {unit},
+            rates: {
+                ...currentCustomUnitRate,
+                rate: Number(rateNumValue) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
+            },
+        };
+
+        Policy.updateWorkspaceCustomUnitAndRate(policy?.id ?? '', distanceCustomUnit, newCustomUnit, policy?.lastModified);
+    };
+
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM>) => {
+        saveUnitAndRate(values.unit as Unit, values.rate);
+        Keyboard.dismiss();
+        Navigation.goBack(ROUTES.WORKSPACE_REIMBURSE.getRoute(policy?.id ?? ''));
+    };
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM>): ValidationError => {
+        const errors: ValidationError = {};
+        const decimalSeparator = toLocaleDigit('.');
+        const outputCurrency = policy?.outputCurrency ?? CONST.CURRENCY.USD;
+        // Allow one more decimal place for accuracy
+        const rateValueRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,${CurrencyUtils.getCurrencyDecimals(outputCurrency) + 1}})?$`, 'i');
+        if (!rateValueRegex.test(values.rate) || values.rate === '') {
+            errors.rate = 'workspace.reimburse.invalidRateError';
+        } else if (NumberUtils.parseFloatAnyLocale(values.rate) <= 0) {
+            errors.rate = 'workspace.reimburse.lowRateError';
+        }
+        return errors;
+    };
+
+    const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const distanceCustomRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+
+    return (
+        <WorkspacePageWithSections
+            headerText={translate('workspace.reimburse.trackDistance')}
+            route={route}
+            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
+            shouldSkipVBBACall
+            backButtonRoute={ROUTES.WORKSPACE_REIMBURSE.getRoute(policy?.id ?? '')}
+            shouldShowLoading={false}
+        >
+            {() => (
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM}
+                    submitButtonText={translate('common.save')}
+                    style={[styles.mh5, styles.flexGrow1]}
+                    scrollContextEnabled
+                    validate={validate}
+                    onSubmit={submit}
+                    enabledWhenOffline
+                >
+                    <OfflineWithFeedback
+                        errors={{
+                            ...(distanceCustomUnit?.errors ?? {}),
+                            ...(distanceCustomRate?.errors ?? {}),
+                        }}
+                        pendingAction={distanceCustomUnit?.pendingAction ?? distanceCustomRate?.pendingAction}
+                        onClose={() => Policy.clearCustomUnitErrors(policy?.id ?? '', distanceCustomUnit?.customUnitID ?? '', distanceCustomRate?.customUnitRateID ?? '')}
+                    >
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            role={CONST.ROLE.PRESENTATION}
+                            inputID="rate"
+                            containerStyles={styles.mt4}
+                            defaultValue={PolicyUtils.getUnitRateValue(toLocaleDigit, distanceCustomRate)}
+                            label={translate('workspace.reimburse.trackDistanceRate')}
+                            aria-label={translate('workspace.reimburse.trackDistanceRate')}
+                            placeholder={policy?.outputCurrency ?? CONST.CURRENCY.USD}
+                            autoCompleteType="off"
+                            autoCorrect={false}
+                            inputMode={CONST.INPUT_MODE.DECIMAL}
+                            maxLength={12}
+                        />
+
+                        <View style={styles.mt4}>
+                            <InputWrapper
+                                InputComponent={Picker}
+                                inputID="unit"
+                                label={translate('workspace.reimburse.trackDistanceUnit')}
+                                items={unitItems}
+                                defaultValue={distanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}
+                            />
+                        </View>
+                    </OfflineWithFeedback>
+                </FormProvider>
+            )}
+        </WorkspacePageWithSections>
+    );
+}
+
+WorkspaceRateAndUnitPage.displayName = 'WorkspaceRateAndUnitPage';
+
+export default withPolicy(WorkspaceRateAndUnitPage);
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
index 709e51cba383..8685cd3b1aee 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
@@ -9,7 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
-import validateRateValue from '@libs/PolicyDistanceRatesUtils';
+import {validateRateValue} from '@libs/PolicyDistanceRatesUtils';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
diff --git a/src/pages/workspace/reimburse/WorkspaceReimbursePage.js b/src/pages/workspace/reimburse/WorkspaceReimbursePage.js
deleted file mode 100644
index 94e72e30e4fb..000000000000
--- a/src/pages/workspace/reimburse/WorkspaceReimbursePage.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
-import compose from '@libs/compose';
-import withPolicy, {policyPropTypes} from '@pages/workspace/withPolicy';
-import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-import CONST from '@src/CONST';
-import WorkspaceReimburseView from './WorkspaceReimburseView';
-
-const propTypes = {
-    /** The route object passed to this page from the navigator */
-    route: PropTypes.shape({
-        /** Each parameter passed via the URL */
-        params: PropTypes.shape({
-            /** The policyID that is being configured */
-            policyID: PropTypes.string.isRequired,
-        }).isRequired,
-    }).isRequired,
-
-    ...policyPropTypes,
-    ...withLocalizePropTypes,
-};
-
-function WorkspaceReimbursePage(props) {
-    return (
-        <WorkspacePageWithSections
-            shouldUseScrollView
-            headerText={props.translate('workspace.common.reimburse')}
-            route={props.route}
-            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
-            shouldShowLoading={false}
-            shouldShowOfflineIndicatorInWideScreen
-        >
-            {() => <WorkspaceReimburseView policy={props.policy} />}
-        </WorkspacePageWithSections>
-    );
-}
-
-WorkspaceReimbursePage.propTypes = propTypes;
-WorkspaceReimbursePage.displayName = 'WorkspaceReimbursePage';
-
-export default compose(withPolicy, withLocalize)(WorkspaceReimbursePage);
diff --git a/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx b/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
new file mode 100644
index 000000000000..3ca99147a83b
--- /dev/null
+++ b/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
@@ -0,0 +1,33 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+import WorkspaceReimburseView from './WorkspaceReimburseView';
+
+type WorkspaceReimbursePageProps = WithPolicyProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.REIMBURSE>;
+
+function WorkspaceReimbursePage({route, policy}: WorkspaceReimbursePageProps) {
+    const {translate} = useLocalize();
+
+    return (
+        <WorkspacePageWithSections
+            shouldUseScrollView
+            headerText={translate('workspace.common.reimburse')}
+            route={route}
+            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
+            shouldSkipVBBACall
+            shouldShowLoading={false}
+        >
+            {() => <WorkspaceReimburseView policy={policy} />}
+        </WorkspacePageWithSections>
+    );
+}
+
+WorkspaceReimbursePage.displayName = 'WorkspaceReimbursePage';
+
+export default withPolicy(WorkspaceReimbursePage);
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js b/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
similarity index 60%
rename from src/pages/workspace/reimburse/WorkspaceReimburseSection.js
rename to src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
index e8ae0e0958b4..18bd121b3fcb 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
@@ -1,45 +1,40 @@
-import lodashGet from 'lodash/get';
-import PropTypes from 'prop-types';
 import React, {useEffect, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
 import ConnectBankAccountButton from '@components/ConnectBankAccountButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
-import networkPropTypes from '@components/networkPropTypes';
 import Section from '@components/Section';
 import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import BankAccount from '@libs/models/BankAccount';
-import * as ReimbursementAccountProps from '@pages/ReimbursementAccount/reimbursementAccountPropTypes';
 import * as Link from '@userActions/Link';
+import type * as OnyxTypes from '@src/types/onyx';
 
-const propTypes = {
+type WorkspaceReimburseSectionProps = {
     /** Policy values needed in the component */
-    policy: PropTypes.shape({
-        id: PropTypes.string,
-    }).isRequired,
+    policy: OnyxEntry<OnyxTypes.Policy>;
 
     /** Bank account attached to free plan */
-    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes.isRequired,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
-    /** Returns translated string for given locale and phrase */
-    translate: PropTypes.func.isRequired,
+    reimbursementAccount: OnyxEntry<OnyxTypes.ReimbursementAccount>;
 };
 
-function WorkspaceReimburseSection(props) {
+function WorkspaceReimburseSection({policy, reimbursementAccount}: WorkspaceReimburseSectionProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const {translate} = useLocalize();
     const [shouldShowLoadingSpinner, setShouldShowLoadingSpinner] = useState(true);
-    const achState = lodashGet(props.reimbursementAccount, 'achData.state', '');
+    const achState = reimbursementAccount?.achData?.state ?? '';
     const hasVBA = achState === BankAccount.STATE.OPEN;
-    const reimburseReceiptsUrl = `reports?policyID=${props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
-    const isLoading = lodashGet(props.reimbursementAccount, 'isLoading', false);
+    const policyId = policy?.id ?? '';
+    const reimburseReceiptsUrl = `reports?policyID=${policyId}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
+    const isLoading = reimbursementAccount?.isLoading ?? false;
     const prevIsLoading = usePrevious(isLoading);
+    const {isOffline} = useNetwork();
 
     useEffect(() => {
         if (prevIsLoading === isLoading) {
@@ -48,15 +43,15 @@ function WorkspaceReimburseSection(props) {
         setShouldShowLoadingSpinner(isLoading);
     }, [prevIsLoading, isLoading]);
 
-    if (props.network.isOffline) {
+    if (isOffline) {
         return (
             <Section
-                title={props.translate('workspace.reimburse.reimburseReceipts')}
+                title={translate('workspace.reimburse.reimburseReceipts')}
                 icon={Illustrations.MoneyWings}
                 isCentralPane
             >
                 <View style={[styles.mv3]}>
-                    <Text>{`${props.translate('common.youAppearToBeOffline')} ${props.translate('common.thisFeatureRequiresInternet')}`}</Text>
+                    <Text>{`${translate('common.youAppearToBeOffline')} ${translate('common.thisFeatureRequiresInternet')}`}</Text>
                 </View>
             </Section>
         );
@@ -75,12 +70,12 @@ function WorkspaceReimburseSection(props) {
 
     return hasVBA ? (
         <Section
-            title={props.translate('workspace.reimburse.fastReimbursementsHappyMembers')}
+            title={translate('workspace.reimburse.fastReimbursementsHappyMembers')}
             icon={Illustrations.TreasureChest}
             isCentralPane
             menuItems={[
                 {
-                    title: props.translate('workspace.reimburse.reimburseReceipts'),
+                    title: translate('workspace.reimburse.reimburseReceipts'),
                     onPress: () => Link.openOldDotLink(reimburseReceiptsUrl),
                     icon: Expensicons.Bank,
                     shouldShowRightIcon: true,
@@ -91,27 +86,26 @@ function WorkspaceReimburseSection(props) {
             ]}
         >
             <View style={[styles.mv3]}>
-                <Text>{props.translate('workspace.reimburse.fastReimbursementsVBACopy')}</Text>
+                <Text>{translate('workspace.reimburse.fastReimbursementsVBACopy')}</Text>
             </View>
         </Section>
     ) : (
         <Section
-            title={props.translate('workspace.reimburse.unlockNextDayReimbursements')}
+            title={translate('workspace.reimburse.unlockNextDayReimbursements')}
             icon={Illustrations.OpenSafe}
             isCentralPane
         >
             <View style={[styles.mv3]}>
-                <Text>{props.translate('workspace.reimburse.unlockNoVBACopy')}</Text>
+                <Text>{translate('workspace.reimburse.unlockNoVBACopy')}</Text>
             </View>
             <ConnectBankAccountButton
-                policyID={props.policy.id}
+                policyID={policy?.id ?? ''}
                 style={[styles.mt4]}
             />
         </Section>
     );
 }
 
-WorkspaceReimburseSection.propTypes = propTypes;
 WorkspaceReimburseSection.displayName = 'WorkspaceReimburseSection';
 
 export default WorkspaceReimburseSection;
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
similarity index 56%
rename from src/pages/workspace/reimburse/WorkspaceReimburseView.js
rename to src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
index 636675098d23..9c7b1c493e8d 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
@@ -1,87 +1,58 @@
-import lodashGet from 'lodash/get';
-import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import CopyTextToClipboard from '@components/CopyTextToClipboard';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import networkPropTypes from '@components/networkPropTypes';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import {withNetwork} from '@components/OnyxProvider';
 import Section from '@components/Section';
 import Text from '@components/Text';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReimbursementAccountProps from '@pages/ReimbursementAccount/reimbursementAccountPropTypes';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as Link from '@userActions/Link';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {Unit} from '@src/types/onyx/Policy';
 import WorkspaceReimburseSection from './WorkspaceReimburseSection';
 
-const propTypes = {
-    /** Policy values needed in the component */
-    policy: PropTypes.shape({
-        id: PropTypes.string,
-        customUnits: PropTypes.objectOf(
-            PropTypes.shape({
-                customUnitID: PropTypes.string,
-                name: PropTypes.string,
-                attributes: PropTypes.shape({
-                    unit: PropTypes.string,
-                }),
-                rates: PropTypes.objectOf(
-                    PropTypes.shape({
-                        customUnitRateID: PropTypes.string,
-                        name: PropTypes.string,
-                        rate: PropTypes.number,
-                    }),
-                ),
-            }),
-        ),
-        outputCurrency: PropTypes.string,
-        lastModified: PropTypes.number,
-    }).isRequired,
-
-    /** From Onyx */
+type WorkspaceReimburseViewOnyxProps = {
     /** Bank account attached to free plan */
-    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
-    ...withLocalizePropTypes,
+    reimbursementAccount: OnyxEntry<OnyxTypes.ReimbursementAccount>;
 };
 
-const defaultProps = {
-    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountDefaultProps,
+type WorkspaceReimburseViewProps = WorkspaceReimburseViewOnyxProps & {
+    /** Policy values needed in the component */
+    policy: OnyxEntry<OnyxTypes.Policy>;
 };
 
-function WorkspaceReimburseView(props) {
+function WorkspaceReimburseView({policy, reimbursementAccount}: WorkspaceReimburseViewProps) {
     const styles = useThemeStyles();
-    const [currentRatePerUnit, setCurrentRatePerUnit] = useState('');
+    const [currentRatePerUnit, setCurrentRatePerUnit] = useState<string>('');
     const {isSmallScreenWidth} = useWindowDimensions();
-    const viewAllReceiptsUrl = `expenses?policyIDList=${props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
-    const distanceCustomUnit = _.find(lodashGet(props.policy, 'customUnits', {}), (unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-    const distanceCustomRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), (rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
-    const {translate, toLocaleDigit} = props;
+    const viewAllReceiptsUrl = `expenses?policyIDList=${policy?.id ?? ''}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
+    const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const distanceCustomRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+    const {translate, toLocaleDigit} = useLocalize();
+    const {isOffline} = useNetwork();
 
-    const getUnitLabel = useCallback((value) => translate(`common.${value}`), [translate]);
+    const getUnitLabel = useCallback((value: Unit): string => translate(`common.${value}`), [translate]);
 
     const getCurrentRatePerUnitLabel = useCallback(() => {
-        const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'rates', '{}'), (rate) => rate && rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
-        const currentUnit = getUnitLabel(lodashGet(distanceCustomUnit, 'attributes.unit', CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES));
-        const currentRate = PolicyUtils.getUnitRateValue(customUnitRate, toLocaleDigit);
+        const customUnitRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate && rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+        const currentUnit = getUnitLabel(distanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES);
+        const currentRate = PolicyUtils.getUnitRateValue(toLocaleDigit, customUnitRate);
         const perWord = translate('common.per');
+
         return `${currentRate} ${perWord} ${currentUnit}`;
     }, [translate, distanceCustomUnit, toLocaleDigit, getUnitLabel]);
 
@@ -90,19 +61,19 @@ function WorkspaceReimburseView(props) {
         // openWorkspaceReimburseView uses API.read which will not make the request until all WRITE requests in the sequential queue have finished responding, so there would be a delay in
         // updating Onyx with the optimistic data.
         BankAccounts.setReimbursementAccountLoading(true);
-        Policy.openWorkspaceReimburseView(props.policy.id);
-    }, [props.policy.id]);
+        Policy.openWorkspaceReimburseView(policy?.id ?? '');
+    }, [policy?.id]);
 
     useEffect(() => {
-        if (props.network.isOffline) {
+        if (isOffline) {
             return;
         }
         fetchData();
-    }, [props.network.isOffline, fetchData]);
+    }, [isOffline, fetchData]);
 
     useEffect(() => {
         setCurrentRatePerUnit(getCurrentRatePerUnitLabel());
-    }, [props.policy.customUnits, getCurrentRatePerUnitLabel]);
+    }, [policy?.customUnits, getCurrentRatePerUnitLabel]);
 
     return (
         <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
@@ -117,7 +88,7 @@ function WorkspaceReimburseView(props) {
                         icon: Expensicons.Receipt,
                         shouldShowRightIcon: true,
                         iconRight: Expensicons.NewWindow,
-                        wrapperStyle: [styles.cardMenuItem],
+                        wrapperStyle: styles.cardMenuItem,
                         link: () => Link.buildOldDotURL(viewAllReceiptsUrl),
                     },
                 ]}
@@ -127,7 +98,7 @@ function WorkspaceReimburseView(props) {
                         {translate('workspace.reimburse.captureNoVBACopyBeforeEmail')}
                         <CopyTextToClipboard
                             text={CONST.EMAIL.RECEIPTS}
-                            textStyles={[styles.textBlue]}
+                            textStyles={styles.textBlue}
                         />
                         <Text>{translate('workspace.reimburse.captureNoVBACopyAfterEmail')}</Text>
                     </Text>
@@ -142,7 +113,7 @@ function WorkspaceReimburseView(props) {
                 <View style={[styles.mv3, styles.flexRow, styles.flexWrap]}>
                     <Text>{translate('workspace.reimburse.trackDistanceCopy')}</Text>
                     <OfflineWithFeedback
-                        pendingAction={lodashGet(distanceCustomUnit, 'pendingAction') || lodashGet(distanceCustomRate, 'pendingAction')}
+                        pendingAction={distanceCustomUnit?.pendingAction ?? distanceCustomRate?.pendingAction}
                         shouldShowErrorMessages={false}
                         style={styles.w100}
                     >
@@ -151,36 +122,29 @@ function WorkspaceReimburseView(props) {
                             description={translate('workspace.reimburse.trackDistanceRate')}
                             shouldShowRightIcon
                             onPress={() => {
-                                Policy.setPolicyIDForReimburseView(props.policy.id);
-                                Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy.id));
+                                Policy.setPolicyIDForReimburseView(policy?.id ?? '');
+                                Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(policy?.id ?? ''));
                             }}
                             wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3]}
-                            brickRoadIndicator={(lodashGet(distanceCustomUnit, 'errors') || lodashGet(distanceCustomRate, 'errors')) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR}
+                            brickRoadIndicator={(distanceCustomUnit?.errors ?? distanceCustomRate?.errors) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR}
                         />
                     </OfflineWithFeedback>
                 </View>
             </Section>
 
             <WorkspaceReimburseSection
-                policy={props.policy}
-                reimbursementAccount={props.reimbursementAccount}
-                network={props.network}
-                translate={translate}
+                policy={policy}
+                reimbursementAccount={reimbursementAccount}
             />
         </View>
     );
 }
 
-WorkspaceReimburseView.defaultProps = defaultProps;
-WorkspaceReimburseView.propTypes = propTypes;
 WorkspaceReimburseView.displayName = 'WorkspaceReimburseView';
 
-export default compose(
-    withLocalize,
-    withNetwork(),
-    withOnyx({
-        reimbursementAccount: {
-            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-        },
-    }),
-)(WorkspaceReimburseView);
+export default withOnyx<WorkspaceReimburseViewProps, WorkspaceReimburseViewOnyxProps>({
+    // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
+    reimbursementAccount: {
+        key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+    },
+})(WorkspaceReimburseView);
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index a355cc062f3d..f764f8d8e987 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -264,6 +264,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                         style={[styles.defaultModalContainer]}
                         testID={WorkspaceTagsPage.displayName}
                         shouldShowOfflineIndicatorInWideScreen
+                        offlineIndicatorStyle={styles.mtAuto}
                     >
                         <HeaderWithBackButton
                             icon={Illustrations.Tag}
@@ -300,7 +301,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                                 subtitle={translate('workspace.tags.emptyTags.subtitle')}
                             />
                         )}
-                        {tagList.length > 0 && (
+                        {tagList.length > 0 && !isLoading && (
                             <SelectionList
                                 canSelectMultiple
                                 sections={[{data: tagList, indexOffset: 0, isDisabled: false}]}
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
index 1efb983be19e..5c77295a9664 100644
--- a/src/pages/workspace/taxes/NamePage.tsx
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -89,7 +89,6 @@ function NamePage({
                             formID={ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM}
                             submitButtonText={translate('workspace.editor.save')}
                             style={[styles.flexGrow1, styles.ph5]}
-                            scrollContextEnabled
                             onSubmit={submit}
                             enabledWhenOffline
                             validate={validate}
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
index d008b11ecb15..6487b3a752b8 100644
--- a/src/pages/workspace/taxes/ValuePage.tsx
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -7,6 +7,7 @@ import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {updatePolicyTaxValue, validateTaxValue} from '@libs/actions/TaxRate';
@@ -35,6 +36,7 @@ function ValuePage({
 }: ValuePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
     const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
     const [value, setValue] = useState(currentTaxRate?.value?.replace('%', ''));
 
@@ -89,6 +91,7 @@ function ValuePage({
                                 onInputChange={setValue}
                                 hideCurrencySymbol
                                 extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
+                                ref={inputCallbackRef}
                             />
                         </FormProvider>
                     </ScreenWrapper>
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 5bcb631c21b0..db59980a2cf4 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -1,6 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {FlatList, View} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
@@ -243,8 +243,11 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
         session?.accountID,
     ]);
 
-    const renderOptionItem = ({item}: {item: ToggleSettingOptionRowProps}) => (
-        <View style={styles.mt7}>
+    const renderOptionItem = (item: ToggleSettingOptionRowProps, index: number) => (
+        <View
+            style={styles.mt7}
+            key={`toggleSettingOptionItem-${index}`}
+        >
             <ToggleSettingOptionRow
                 icon={item.icon}
                 title={item.title}
@@ -277,6 +280,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                 shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
                 shouldSkipVBBACall
                 isLoading={isLoading}
+                shouldUseScrollView
             >
                 <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
@@ -286,11 +290,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                     >
                         <View>
                             <Text style={[styles.mt3, styles.textSupporting]}>{translate('workflowsPage.workflowDescription')}</Text>
-                            <FlatList
-                                data={optionItems}
-                                renderItem={renderOptionItem}
-                                keyExtractor={(item: ToggleSettingOptionRowProps) => item.title}
-                            />
+                            {optionItems.map(renderOptionItem)}
                             <ConfirmModal
                                 title={translate('workspace.bankAccount.workspaceCurrency')}
                                 isVisible={isCurrencyModalOpen}
diff --git a/src/stories/AddressSearch.stories.js b/src/stories/AddressSearch.stories.tsx
similarity index 51%
rename from src/stories/AddressSearch.stories.js
rename to src/stories/AddressSearch.stories.tsx
index 8b9223bc5ea2..50e34cc5b061 100644
--- a/src/stories/AddressSearch.stories.js
+++ b/src/stories/AddressSearch.stories.tsx
@@ -1,12 +1,17 @@
+import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React, {useState} from 'react';
+import type {AddressSearchProps} from '@components/AddressSearch';
 import AddressSearch from '@components/AddressSearch';
+import type {RenamedInputKeysProps, StreetValue} from '@components/AddressSearch/types';
+
+type AddressSearchStory = ComponentStory<typeof AddressSearch>;
 
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-export default {
+const story: ComponentMeta<typeof AddressSearch> = {
     title: 'Components/AddressSearch',
     component: AddressSearch,
     args: {
@@ -15,25 +20,26 @@ export default {
     },
 };
 
-function Template(args) {
-    const [value, setValue] = useState('');
+function Template(props: AddressSearchProps) {
+    const [value, setValue] = useState<string | number | RenamedInputKeysProps | StreetValue>('');
     return (
         <AddressSearch
-            value={value}
-            onInputChange={({street}) => setValue(street)}
+            value={value as string}
+            onInputChange={(inputValue) => setValue(inputValue)}
             // eslint-disable-next-line react/jsx-props-no-spreading
-            {...args}
+            {...props}
         />
     );
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
+const Default: AddressSearchStory = Template.bind({});
 
-const ErrorStory = Template.bind({});
+const ErrorStory: AddressSearchStory = Template.bind({});
 ErrorStory.args = {
     errorText: 'The street you are looking for does not exist',
 };
 
+export default story;
 export {Default, ErrorStory};
diff --git a/src/stories/Banner.stories.js b/src/stories/Banner.stories.tsx
similarity index 72%
rename from src/stories/Banner.stories.js
rename to src/stories/Banner.stories.tsx
index 3a6f454843d1..9328e3d513ab 100644
--- a/src/stories/Banner.stories.js
+++ b/src/stories/Banner.stories.tsx
@@ -1,6 +1,10 @@
+import type {ComponentStory} from '@storybook/react';
 import React from 'react';
+import type {BannerProps} from '@components/Banner';
 import Banner from '@components/Banner';
 
+type BannerStory = ComponentStory<typeof Banner>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
@@ -11,25 +15,25 @@ const story = {
     component: Banner,
 };
 
-function Template(args) {
+function Template(props: BannerProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <Banner {...args} />;
+    return <Banner {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const InfoBanner = Template.bind({});
+const InfoBanner: BannerStory = Template.bind({});
 InfoBanner.args = {
     text: 'This is an informational banner',
 };
 
-const HTMLBanner = Template.bind({});
+const HTMLBanner: BannerStory = Template.bind({});
 HTMLBanner.args = {
     text: 'This is a informational banner containing <strong><em>HTML</em></strong>',
     shouldRenderHTML: true,
 };
 
-const BannerWithLink = Template.bind({});
+const BannerWithLink: BannerStory = Template.bind({});
 BannerWithLink.args = {
     text: 'This is a informational banner containing <a href="https://new.expensify.com/settings">internal Link</a> and <a href=" https://google.com">public link</a>',
     shouldRenderHTML: true,
diff --git a/src/stories/Button.stories.js b/src/stories/Button.stories.tsx
similarity index 79%
rename from src/stories/Button.stories.js
rename to src/stories/Button.stories.tsx
index 2bf254b9f382..3e094b0c65bf 100644
--- a/src/stories/Button.stories.js
+++ b/src/stories/Button.stories.tsx
@@ -1,29 +1,33 @@
 /* eslint-disable react/jsx-props-no-spreading */
+import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
+import type {ButtonProps} from '@components/Button';
 import Button from '@components/Button';
 import Text from '@components/Text';
 
+type ButtonStory = ComponentStory<typeof Button>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-const story = {
+const story: ComponentMeta<typeof Button> = {
     title: 'Components/Button',
     component: Button,
 };
 
-function Template(args) {
+function Template(props: ButtonProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <Button {...args} />;
+    return <Button {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
-const Loading = Template.bind({});
-function PressOnEnter(props) {
+const Default: ButtonStory = Template.bind({});
+const Loading: ButtonStory = Template.bind({});
+function PressOnEnter(props: ButtonProps) {
     const [text, setText] = useState('');
     const onPress = useCallback(() => {
         setText('Button Pressed!');
@@ -33,13 +37,13 @@ function PressOnEnter(props) {
         <Button
             {...props}
             // eslint-disable-next-line react/prop-types
-            text={text || props.text}
+            text={text}
             onPress={onPress}
         />
     );
 }
 
-function PressOnEnterWithBubbling(props) {
+function PressOnEnterWithBubbling(props: ButtonProps) {
     return (
         <>
             <Text>Both buttons will trigger on press of Enter as the Enter event will bubble across all instances of button.</Text>
diff --git a/src/stories/ButtonWithDropdownMenu.stories.js b/src/stories/ButtonWithDropdownMenu.stories.tsx
similarity index 51%
rename from src/stories/ButtonWithDropdownMenu.stories.js
rename to src/stories/ButtonWithDropdownMenu.stories.tsx
index b87bdc321d45..dd7d8a783aaf 100644
--- a/src/stories/ButtonWithDropdownMenu.stories.js
+++ b/src/stories/ButtonWithDropdownMenu.stories.tsx
@@ -1,5 +1,10 @@
+import type {ComponentStory} from '@storybook/react';
 import React from 'react';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {ButtonWithDropdownMenuProps} from '@components/ButtonWithDropdownMenu/types';
+import * as Expensicons from '@components/Icon/Expensicons';
+
+type ButtonWithDropdownMenuStory = ComponentStory<typeof ButtonWithDropdownMenu>;
 
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
@@ -11,23 +16,23 @@ const story = {
     component: ButtonWithDropdownMenu,
 };
 
-function Template(args) {
+function Template(props: ButtonWithDropdownMenuProps<unknown>) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <ButtonWithDropdownMenu {...args} />;
+    return <ButtonWithDropdownMenu {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
+const Default: ButtonWithDropdownMenuStory = Template.bind({});
 Default.args = {
-    buttonText: 'Pay using Expensify',
+    customText: 'Pay using Expensify',
     onPress: (e, item) => {
-        alert(`Button ${item} is pressed.`);
+        alert(`Button ${item as string} is pressed.`);
     },
     pressOnEnter: true,
     options: [
-        {value: 'One', text: 'One'},
-        {value: 'Two', text: 'Two'},
+        {value: 'One', text: 'One', icon: Expensicons.Wallet},
+        {value: 'Two', text: 'Two', icon: Expensicons.Wallet},
     ],
 };
 
diff --git a/src/stories/HeaderWithBackButton.stories.tsx b/src/stories/HeaderWithBackButton.stories.tsx
index 8306d8e19225..ca723715d5f0 100644
--- a/src/stories/HeaderWithBackButton.stories.tsx
+++ b/src/stories/HeaderWithBackButton.stories.tsx
@@ -2,25 +2,22 @@ import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React from 'react';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import type HeaderWithBackButtonProps from '@components/HeaderWithBackButton/types';
-import withNavigationFallback from '@components/withNavigationFallback';
 
-const HeaderWithBackButtonWithNavigation = withNavigationFallback(HeaderWithBackButton);
-
-type HeaderWithBackButtonStory = ComponentStory<typeof HeaderWithBackButtonWithNavigation>;
+type HeaderWithBackButtonStory = ComponentStory<typeof HeaderWithBackButton>;
 
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-const story: ComponentMeta<typeof HeaderWithBackButtonWithNavigation> = {
+const story: ComponentMeta<typeof HeaderWithBackButton> = {
     title: 'Components/HeaderWithBackButton',
-    component: HeaderWithBackButtonWithNavigation,
+    component: HeaderWithBackButton,
 };
 
 function Template(props: HeaderWithBackButtonProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <HeaderWithBackButtonWithNavigation {...props} />;
+    return <HeaderWithBackButton {...props} />;
 }
 
 // Arguments can be passed to the component by binding
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 120b848bd5a4..a56a858d1707 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -1552,7 +1552,6 @@ const styles = (theme: ThemeColors) =>
 
         breadcrumbLogo: {
             top: 1.66, // Pixel-perfect alignment due to a small difference between logo height and breadcrumb text height
-            height: variables.lineHeightSizeh1,
         },
 
         LHPNavigatorContainer: (isSmallScreenWidth: boolean) =>
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 4c66967f52b9..fa4c19539072 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -755,7 +755,7 @@ function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth: boolean, isMon
     if (isSmallScreenWidth) {
         return {
             height: emptyStateBackground.SMALL_SCREEN.IMAGE_HEIGHT,
-            width: '200%',
+            width: '100%',
             position: 'absolute',
         };
     }
diff --git a/src/types/modules/react-native-clipboard.d.ts b/src/types/modules/react-native-clipboard.d.ts
index 14f418a3f8b9..c38b3b2ff7cc 100644
--- a/src/types/modules/react-native-clipboard.d.ts
+++ b/src/types/modules/react-native-clipboard.d.ts
@@ -1,16 +1,7 @@
 declare module '@react-native-clipboard/clipboard/jest/clipboard-mock' {
-    const mockClipboard: {
-        getString: jest.MockedFunction<() => Promise<string>>;
-        getImagePNG: jest.MockedFunction<() => void>;
-        getImageJPG: jest.MockedFunction<() => void>;
-        setImage: jest.MockedFunction<() => void>;
-        setString: jest.MockedFunction<() => void>;
-        hasString: jest.MockedFunction<() => Promise<boolean>>;
-        hasImage: jest.MockedFunction<() => Promise<boolean>>;
-        hasURL: jest.MockedFunction<() => Promise<boolean>>;
-        addListener: jest.MockedFunction<() => void>;
-        removeAllListeners: jest.MockedFunction<() => void>;
-        useClipboard: jest.MockedFunction<() => [string, jest.MockedFunction<() => void>]>;
-    };
-    export default mockClipboard;
+    import type Clipboard from '@react-native-clipboard/clipboard';
+
+    const clipboardMock: typeof Clipboard;
+
+    export default clipboardMock;
 }
diff --git a/tests/actions/IOUTest.js b/tests/actions/IOUTest.js
deleted file mode 100644
index 5e9efcc00617..000000000000
--- a/tests/actions/IOUTest.js
+++ /dev/null
@@ -1,2978 +0,0 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import CONST from '../../src/CONST';
-import * as IOU from '../../src/libs/actions/IOU';
-import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
-import * as PolicyActions from '../../src/libs/actions/Policy';
-import * as Report from '../../src/libs/actions/Report';
-import * as ReportActions from '../../src/libs/actions/ReportActions';
-import * as User from '../../src/libs/actions/User';
-import DateUtils from '../../src/libs/DateUtils';
-import Navigation from '../../src/libs/Navigation/Navigation';
-import * as NumberUtils from '../../src/libs/NumberUtils';
-import * as PersonalDetailsUtils from '../../src/libs/PersonalDetailsUtils';
-import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
-import * as ReportUtils from '../../src/libs/ReportUtils';
-import ONYXKEYS from '../../src/ONYXKEYS';
-import ROUTES from '../../src/ROUTES';
-import PusherHelper from '../utils/PusherHelper';
-import * as TestHelper from '../utils/TestHelper';
-import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
-import waitForNetworkPromises from '../utils/waitForNetworkPromises';
-
-jest.mock('../../src/libs/Navigation/Navigation', () => ({
-    navigate: jest.fn(),
-    dismissModal: jest.fn(),
-    dismissModalWithReport: jest.fn(),
-    goBack: jest.fn(),
-}));
-
-const CARLOS_EMAIL = 'cmartins@expensifail.com';
-const CARLOS_ACCOUNT_ID = 1;
-const JULES_EMAIL = 'jules@expensifail.com';
-const JULES_ACCOUNT_ID = 2;
-const RORY_EMAIL = 'rory@expensifail.com';
-const RORY_ACCOUNT_ID = 3;
-const VIT_EMAIL = 'vit@expensifail.com';
-const VIT_ACCOUNT_ID = 4;
-
-OnyxUpdateManager();
-describe('actions/IOU', () => {
-    beforeAll(() => {
-        Onyx.init({
-            keys: ONYXKEYS,
-        });
-    });
-
-    beforeEach(() => {
-        global.fetch = TestHelper.getGlobalFetchMock();
-        return Onyx.clear().then(waitForBatchedUpdates);
-    });
-
-    describe('requestMoney', () => {
-        it('creates new chat if needed', () => {
-            const amount = 10000;
-            const comment = 'Giv money plz';
-            const merchant = 'KFC';
-            let iouReportID;
-            let createdAction;
-            let iouAction;
-            let transactionID;
-            let transactionThread;
-            let transactionThreadCreatedAction;
-            fetch.pause();
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForBatchedUpdates()
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // A chat report, a transaction thread, and an iou report should be created
-                                    const chatReports = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-                                    const iouReports = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    expect(_.size(chatReports)).toBe(2);
-                                    expect(_.size(iouReports)).toBe(1);
-                                    const chatReport = chatReports[0];
-                                    const transactionThreadReport = chatReports[1];
-                                    const iouReport = iouReports[0];
-                                    iouReportID = iouReport.reportID;
-                                    transactionThread = transactionThreadReport;
-
-                                    expect(iouReport.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                    // They should be linked together
-                                    expect(chatReport.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
-                                    expect(chatReport.iouReportID).toBe(iouReport.reportID);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // The IOU report should have a CREATED action and IOU action
-                                    expect(_.size(reportActionsForIOUReport)).toBe(2);
-                                    const createdActions = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    const iouActions = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    expect(_.size(createdActions)).toBe(1);
-                                    expect(_.size(iouActions)).toBe(1);
-                                    createdAction = createdActions[0];
-                                    iouAction = iouActions[0];
-
-                                    // The CREATED action should not be created after the IOU action
-                                    expect(Date.parse(createdAction.created)).toBeLessThan(Date.parse(iouAction.created));
-
-                                    // The IOUReportID should be correct
-                                    expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
-
-                                    // The comment should be included in the IOU action
-                                    expect(iouAction.originalMessage.comment).toBe(comment);
-
-                                    // The amount in the IOU action should be correct
-                                    expect(iouAction.originalMessage.amount).toBe(amount);
-
-                                    // The IOU type should be correct
-                                    expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-
-                                    // Both actions should be pending
-                                    expect(createdAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(iouAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForTransactionThread) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // The transaction thread should have a CREATED action
-                                    expect(_.size(reportActionsForTransactionThread)).toBe(1);
-                                    const createdActions = _.filter(reportActionsForTransactionThread, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    expect(_.size(createdActions)).toBe(1);
-                                    transactionThreadCreatedAction = createdActions[0];
-
-                                    expect(transactionThreadCreatedAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // There should be one transaction
-                                    expect(_.size(allTransactions)).toBe(1);
-                                    const transaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    transactionID = transaction.transactionID;
-
-                                    // The transaction should be attached to the IOU report
-                                    expect(transaction.reportID).toBe(iouReportID);
-
-                                    // Its amount should match the amount of the request
-                                    expect(transaction.amount).toBe(amount);
-
-                                    // The comment should be correct
-                                    expect(transaction.comment.comment).toBe(comment);
-
-                                    // It should be pending
-                                    expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    // The transactionID on the iou action should match the one from the transactions collection
-                                    expect(iouAction.originalMessage.IOUTransactionID).toBe(transactionID);
-
-                                    expect(transaction.merchant).toBe(merchant);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(fetch.resume)
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(_.size(reportActionsForIOUReport)).toBe(2);
-                                    _.each(reportActionsForIOUReport, (reportAction) => expect(reportAction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                waitForCollectionCallback: true,
-                                callback: (transaction) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(transaction.pendingAction).toBeFalsy();
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-
-        it('updates existing chat report if there is one', () => {
-            const amount = 10000;
-            const comment = 'Giv money plz';
-            let chatReport = {
-                reportID: 1234,
-                type: CONST.REPORT.TYPE.CHAT,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
-            };
-            const createdAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
-            };
-            let iouReportID;
-            let iouAction;
-            let iouCreatedAction;
-            let transactionID;
-            fetch.pause();
-            return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, chatReport)
-                .then(() =>
-                    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, {
-                        [createdAction.reportActionID]: createdAction,
-                    }),
-                )
-                .then(() => {
-                    IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // The same chat report should be reused, a transaction thread and an IOU report should be created
-                                    expect(_.size(allReports)).toBe(3);
-                                    expect(_.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT).reportID).toBe(chatReport.reportID);
-                                    chatReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-                                    const iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    iouReportID = iouReport.reportID;
-
-                                    expect(iouReport.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                    // They should be linked together
-                                    expect(chatReport.iouReportID).toBe(iouReportID);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (allIOUReportActions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // The chat report should have a CREATED and an IOU action
-                                    expect(_.size(allIOUReportActions)).toBe(2);
-                                    iouCreatedAction = _.find(allIOUReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    iouAction = _.find(allIOUReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-
-                                    // The CREATED action should not be created after the IOU action
-                                    expect(Date.parse(iouCreatedAction.created)).toBeLessThan(Date.parse(iouAction.created));
-
-                                    // The IOUReportID should be correct
-                                    expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
-
-                                    // The comment should be included in the IOU action
-                                    expect(iouAction.originalMessage.comment).toBe(comment);
-
-                                    // The amount in the IOU action should be correct
-                                    expect(iouAction.originalMessage.amount).toBe(amount);
-
-                                    // The IOU action type should be correct
-                                    expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-
-                                    // The IOU action should be pending
-                                    expect(iouAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // There should be one transaction
-                                    expect(_.size(allTransactions)).toBe(1);
-                                    const transaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    transactionID = transaction.transactionID;
-
-                                    // The transaction should be attached to the IOU report
-                                    expect(transaction.reportID).toBe(iouReportID);
-
-                                    // Its amount should match the amount of the request
-                                    expect(transaction.amount).toBe(amount);
-
-                                    // The comment should be correct
-                                    expect(transaction.comment.comment).toBe(comment);
-
-                                    expect(transaction.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
-
-                                    // It should be pending
-                                    expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    // The transactionID on the iou action should match the one from the transactions collection
-                                    expect(iouAction.originalMessage.IOUTransactionID).toBe(transactionID);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(fetch.resume)
-                .then(waitForBatchedUpdates)
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(_.size(reportActionsForIOUReport)).toBe(2);
-                                    _.each(reportActionsForIOUReport, (reportAction) => expect(reportAction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                waitForCollectionCallback: true,
-                                callback: (transaction) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(transaction.pendingAction).toBeFalsy();
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-
-        it('updates existing IOU report if there is one', () => {
-            const amount = 10000;
-            const comment = 'Giv money plz';
-            const chatReportID = 1234;
-            const iouReportID = 5678;
-            let chatReport = {
-                reportID: chatReportID,
-                type: CONST.REPORT.TYPE.CHAT,
-                iouReportID,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
-            };
-            const createdAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
-            };
-            const existingTransaction = {
-                transactionID: NumberUtils.rand64(),
-                amount: 1000,
-                comment: '',
-                created: DateUtils.getDBTime(),
-            };
-            let iouReport = {
-                reportID: iouReportID,
-                chatReportID,
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: RORY_ACCOUNT_ID,
-                managerID: CARLOS_ACCOUNT_ID,
-                currency: CONST.CURRENCY.USD,
-                total: existingTransaction.amount,
-            };
-            const iouAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
-                actorAccountID: RORY_ACCOUNT_ID,
-                created: DateUtils.getDBTime(),
-                originalMessage: {
-                    IOUReportID: iouReportID,
-                    IOUTransactionID: existingTransaction.transactionID,
-                    amount: existingTransaction.amount,
-                    currency: CONST.CURRENCY.USD,
-                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-                    participantAccountIDs: [RORY_ACCOUNT_ID, CARLOS_ACCOUNT_ID],
-                },
-            };
-            let newIOUAction;
-            let newTransaction;
-            fetch.pause();
-            return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, chatReport)
-                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, iouReport))
-                .then(() =>
-                    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {
-                        [createdAction.reportActionID]: createdAction,
-                        [iouAction.reportActionID]: iouAction,
-                    }),
-                )
-                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${existingTransaction.transactionID}`, existingTransaction))
-                .then(() => {
-                    IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // No new reports should be created
-                                    expect(_.size(allReports)).toBe(3);
-                                    expect(_.find(allReports, (report) => report.reportID === chatReportID)).toBeTruthy();
-                                    expect(_.find(allReports, (report) => report.reportID === iouReportID)).toBeTruthy();
-
-                                    chatReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-                                    iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-
-                                    // The total on the iou report should be updated
-                                    expect(iouReport.total).toBe(11000);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    expect(_.size(reportActionsForIOUReport)).toBe(3);
-                                    newIOUAction = _.find(
-                                        reportActionsForIOUReport,
-                                        (reportAction) => reportAction.reportActionID !== createdAction.reportActionID && reportAction.reportActionID !== iouAction.reportActionID,
-                                    );
-
-                                    // The IOUReportID should be correct
-                                    expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
-
-                                    // The comment should be included in the IOU action
-                                    expect(newIOUAction.originalMessage.comment).toBe(comment);
-
-                                    // The amount in the IOU action should be correct
-                                    expect(newIOUAction.originalMessage.amount).toBe(amount);
-
-                                    // The type of the IOU action should be correct
-                                    expect(newIOUAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-
-                                    // The IOU action should be pending
-                                    expect(newIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // There should be two transactions
-                                    expect(_.size(allTransactions)).toBe(2);
-
-                                    newTransaction = _.find(allTransactions, (transaction) => transaction.transactionID !== existingTransaction.transactionID);
-
-                                    expect(newTransaction.reportID).toBe(iouReportID);
-                                    expect(newTransaction.amount).toBe(amount);
-                                    expect(newTransaction.comment.comment).toBe(comment);
-                                    expect(newTransaction.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
-                                    expect(newTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    // The transactionID on the iou action should match the one from the transactions collection
-                                    expect(newIOUAction.originalMessage.IOUTransactionID).toBe(newTransaction.transactionID);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(fetch.resume)
-                .then(waitForNetworkPromises)
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(_.size(reportActionsForIOUReport)).toBe(3);
-                                    _.each(reportActionsForIOUReport, (reportAction) => expect(reportAction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-                                    _.each(allTransactions, (transaction) => expect(transaction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-
-        it('correctly implements RedBrickRoad error handling', () => {
-            const amount = 10000;
-            const comment = 'Giv money plz';
-            let chatReportID;
-            let iouReportID;
-            let createdAction;
-            let iouAction;
-            let transactionID;
-            let transactionThreadReport;
-            let transactionThreadAction;
-            fetch.pause();
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return (
-                waitForBatchedUpdates()
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // A chat report, transaction thread and an iou report should be created
-                                        const chatReports = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-                                        const iouReports = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                        expect(_.size(chatReports)).toBe(2);
-                                        expect(_.size(iouReports)).toBe(1);
-                                        const chatReport = chatReports[0];
-                                        chatReportID = chatReport.reportID;
-                                        transactionThreadReport = chatReports[1];
-
-                                        const iouReport = iouReports[0];
-                                        iouReportID = iouReport.reportID;
-
-                                        expect(iouReport.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                        // They should be linked together
-                                        expect(chatReport.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
-                                        expect(chatReport.iouReportID).toBe(iouReport.reportID);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // The chat report should have a CREATED action and IOU action
-                                        expect(_.size(reportActionsForIOUReport)).toBe(2);
-                                        const createdActions = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                        const iouActions = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                        expect(_.size(createdActions)).toBe(1);
-                                        expect(_.size(iouActions)).toBe(1);
-                                        createdAction = createdActions[0];
-                                        iouAction = iouActions[0];
-
-                                        // The CREATED action should not be created after the IOU action
-                                        expect(Date.parse(createdAction.created)).toBeLessThan(Date.parse(iouAction.created));
-
-                                        // The IOUReportID should be correct
-                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
-
-                                        // The comment should be included in the IOU action
-                                        expect(iouAction.originalMessage.comment).toBe(comment);
-
-                                        // The amount in the IOU action should be correct
-                                        expect(iouAction.originalMessage.amount).toBe(amount);
-
-                                        // The type should be correct
-                                        expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-
-                                        // Both actions should be pending
-                                        expect(createdAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(iouAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // There should be one transaction
-                                        expect(_.size(allTransactions)).toBe(1);
-                                        const transaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                        transactionID = transaction.transactionID;
-
-                                        expect(transaction.reportID).toBe(iouReportID);
-                                        expect(transaction.amount).toBe(amount);
-                                        expect(transaction.comment.comment).toBe(comment);
-                                        expect(transaction.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
-                                        expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                        // The transactionID on the iou action should match the one from the transactions collection
-                                        expect(iouAction.originalMessage.IOUTransactionID).toBe(transactionID);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(() => {
-                        fetch.fail();
-                        return fetch.resume();
-                    })
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(_.size(reportActionsForIOUReport)).toBe(2);
-                                        iouAction = _.find(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                        expect(iouAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (reportActionsForTransactionThread) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(_.size(reportActionsForTransactionThread)).toBe(3);
-                                        transactionThreadAction = _.find(
-                                            reportActionsForTransactionThread[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`],
-                                            (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                        );
-                                        expect(transactionThreadAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(transaction.pendingAction).toBeFalsy();
-                                        expect(transaction.errors).toBeTruthy();
-                                        expect(_.values(transaction.errors)[0]).toEqual(expect.arrayContaining(['iou.error.genericCreateFailureMessage', {isTranslated: false}]));
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // If the user clears the errors on the IOU action
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                ReportActions.clearReportActionErrors(iouReportID, iouAction);
-                                ReportActions.clearReportActionErrors(transactionThreadReport.reportID, transactionThreadAction);
-                                resolve();
-                            }),
-                    )
-
-                    // Then the reportAction should be removed from Onyx
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (reportActionsForReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        iouAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                        expect(iouAction).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // Along with the associated transaction
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                    waitForCollectionCallback: true,
-                                    callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(transaction).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // If a user clears the errors on the CREATED action (which, technically are just errors on the report)
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                Report.deleteReport(chatReportID);
-                                Report.deleteReport(transactionThreadReport.reportID);
-                                resolve();
-                            }),
-                    )
-
-                    // Then the report should be deleted
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
-                                        _.each(allReports, (report) => expect(report).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // All reportActions should also be deleted
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
-                                        _.each(allReportActions, (reportAction) => expect(reportAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // All transactions should also be deleted
-                    .then(
-                        () =>
-                            new Promise((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-                                        _.each(allTransactions, (transaction) => expect(transaction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-
-                    // Cleanup
-                    .then(fetch.succeed)
-            );
-        });
-    });
-
-    describe('split bill', () => {
-        it('creates and updates new chats and IOUs as needed', () => {
-            jest.setTimeout(10 * 1000);
-            /*
-             * Given that:
-             *   - Rory and Carlos have chatted before
-             *   - Rory and Jules have chatted before and have an active IOU report
-             *   - Rory and Vit have never chatted together before
-             *   - There is no existing group chat with the four of them
-             */
-            const amount = 400;
-            const comment = 'Yes, I am splitting a bill for $4 USD';
-            const merchant = 'Yema Kitchen';
-            let carlosChatReport = {
-                reportID: NumberUtils.rand64(),
-                type: CONST.REPORT.TYPE.CHAT,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
-            };
-            const carlosCreatedAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
-            };
-            const julesIOUReportID = NumberUtils.rand64();
-            let julesChatReport = {
-                reportID: NumberUtils.rand64(),
-                type: CONST.REPORT.TYPE.CHAT,
-                iouReportID: julesIOUReportID,
-                participantAccountIDs: [JULES_ACCOUNT_ID],
-            };
-            const julesChatCreatedAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
-            };
-            const julesCreatedAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
-            };
-            jest.advanceTimersByTime(200);
-            const julesExistingTransaction = {
-                transactionID: NumberUtils.rand64(),
-                amount: 1000,
-                comment: 'This is an existing transaction',
-                created: DateUtils.getDBTime(),
-            };
-            let julesIOUReport = {
-                reportID: julesIOUReportID,
-                chatReportID: julesChatReport.reportID,
-                type: CONST.REPORT.TYPE.IOU,
-                ownerAccountID: RORY_ACCOUNT_ID,
-                managerID: JULES_ACCOUNT_ID,
-                currency: CONST.CURRENCY.USD,
-                total: julesExistingTransaction.amount,
-            };
-            const julesExistingIOUAction = {
-                reportActionID: NumberUtils.rand64(),
-                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
-                actorAccountID: RORY_ACCOUNT_ID,
-                created: DateUtils.getDBTime(),
-                originalMessage: {
-                    IOUReportID: julesIOUReportID,
-                    IOUTransactionID: julesExistingTransaction.transactionID,
-                    amount: julesExistingTransaction.amount,
-                    currency: CONST.CURRENCY.USD,
-                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-                    participantAccountIDs: [RORY_ACCOUNT_ID, JULES_ACCOUNT_ID],
-                },
-            };
-
-            let carlosIOUReport;
-            let carlosIOUAction;
-            let carlosIOUCreatedAction;
-            let carlosTransaction;
-
-            let julesIOUAction;
-            let julesIOUCreatedAction;
-            let julesTransaction;
-
-            let vitChatReport;
-            let vitIOUReport;
-            let vitCreatedAction;
-            let vitIOUAction;
-            let vitTransaction;
-
-            let groupChat;
-            let groupCreatedAction;
-            let groupIOUAction;
-            let groupTransaction;
-
-            return Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {
-                [`${ONYXKEYS.COLLECTION.REPORT}${carlosChatReport.reportID}`]: carlosChatReport,
-                [`${ONYXKEYS.COLLECTION.REPORT}${julesChatReport.reportID}`]: julesChatReport,
-                [`${ONYXKEYS.COLLECTION.REPORT}${julesIOUReport.reportID}`]: julesIOUReport,
-            })
-                .then(() =>
-                    Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
-                        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${carlosChatReport.reportID}`]: {
-                            [carlosCreatedAction.reportActionID]: carlosCreatedAction,
-                        },
-                        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesChatReport.reportID}`]: {
-                            [julesChatCreatedAction.reportActionID]: julesChatCreatedAction,
-                        },
-                        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesIOUReport.reportID}`]: {
-                            [julesCreatedAction.reportActionID]: julesCreatedAction,
-                            [julesExistingIOUAction.reportActionID]: julesExistingIOUAction,
-                        },
-                    }),
-                )
-                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction.transactionID}`, julesExistingTransaction))
-                .then(() => {
-                    // When we split a bill offline
-                    fetch.pause();
-                    IOU.splitBill(
-                        // TODO: Migrate after the backend accepts accountIDs
-                        _.map(
-                            [
-                                [CARLOS_EMAIL, CARLOS_ACCOUNT_ID],
-                                [JULES_EMAIL, JULES_ACCOUNT_ID],
-                                [VIT_EMAIL, VIT_ACCOUNT_ID],
-                            ],
-                            ([email, accountID]) => ({login: email, accountID}),
-                        ),
-                        RORY_EMAIL,
-                        RORY_ACCOUNT_ID,
-                        amount,
-                        comment,
-                        CONST.CURRENCY.USD,
-                        merchant,
-                    );
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // There should now be 10 reports
-                                    expect(_.size(allReports)).toBe(10);
-
-                                    // 1. The chat report with Rory + Carlos
-                                    carlosChatReport = _.find(allReports, (report) => report.reportID === carlosChatReport.reportID);
-                                    expect(_.isEmpty(carlosChatReport)).toBe(false);
-                                    expect(carlosChatReport.pendingFields).toBeFalsy();
-
-                                    // 2. The IOU report with Rory + Carlos (new)
-                                    carlosIOUReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU && report.managerID === CARLOS_ACCOUNT_ID);
-                                    expect(_.isEmpty(carlosIOUReport)).toBe(false);
-                                    expect(carlosIOUReport.total).toBe(amount / 4);
-
-                                    // 3. The chat report with Rory + Jules
-                                    julesChatReport = _.find(allReports, (report) => report.reportID === julesChatReport.reportID);
-                                    expect(_.isEmpty(julesChatReport)).toBe(false);
-                                    expect(julesChatReport.pendingFields).toBeFalsy();
-
-                                    // 4. The IOU report with Rory + Jules
-                                    julesIOUReport = _.find(allReports, (report) => report.reportID === julesIOUReport.reportID);
-                                    expect(_.isEmpty(julesIOUReport)).toBe(false);
-                                    expect(julesChatReport.pendingFields).toBeFalsy();
-                                    expect(julesIOUReport.total).toBe(julesExistingTransaction.amount + amount / 4);
-
-                                    // 5. The chat report with Rory + Vit (new)
-                                    vitChatReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT && _.isEqual(report.participantAccountIDs, [VIT_ACCOUNT_ID]));
-                                    expect(_.isEmpty(vitChatReport)).toBe(false);
-                                    expect(vitChatReport.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
-
-                                    // 6. The IOU report with Rory + Vit (new)
-                                    vitIOUReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU && report.managerID === VIT_ACCOUNT_ID);
-                                    expect(_.isEmpty(vitIOUReport)).toBe(false);
-                                    expect(vitIOUReport.total).toBe(amount / 4);
-
-                                    // 7. The group chat with everyone
-                                    groupChat = _.find(
-                                        allReports,
-                                        (report) => report.type === CONST.REPORT.TYPE.CHAT && _.isEqual(report.participantAccountIDs, [CARLOS_ACCOUNT_ID, JULES_ACCOUNT_ID, VIT_ACCOUNT_ID]),
-                                    );
-                                    expect(_.isEmpty(groupChat)).toBe(false);
-                                    expect(groupChat.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
-
-                                    // The 1:1 chat reports and the IOU reports should be linked together
-                                    expect(carlosChatReport.iouReportID).toBe(carlosIOUReport.reportID);
-                                    expect(carlosIOUReport.chatReportID).toBe(carlosChatReport.reportID);
-                                    expect(carlosIOUReport.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                    expect(julesChatReport.iouReportID).toBe(julesIOUReport.reportID);
-                                    expect(julesIOUReport.chatReportID).toBe(julesChatReport.reportID);
-
-                                    expect(vitChatReport.iouReportID).toBe(vitIOUReport.reportID);
-                                    expect(vitIOUReport.chatReportID).toBe(vitChatReport.reportID);
-                                    expect(carlosIOUReport.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                waitForCollectionCallback: true,
-                                callback: (allReportActions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    // There should be reportActions on all 7 chat reports + 3 IOU reports in each 1:1 chat
-                                    expect(_.size(allReportActions)).toBe(10);
-
-                                    const carlosReportActions = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${carlosChatReport.iouReportID}`];
-                                    const julesReportActions = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesChatReport.iouReportID}`];
-                                    const vitReportActions = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${vitChatReport.iouReportID}`];
-                                    const groupReportActions = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChat.reportID}`];
-
-                                    // Carlos DM should have two reportActions – the existing CREATED action and a pending IOU action
-                                    expect(_.size(carlosReportActions)).toBe(2);
-                                    carlosIOUCreatedAction = _.find(carlosReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    carlosIOUAction = _.find(carlosReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    expect(carlosIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(carlosIOUAction.originalMessage.IOUReportID).toBe(carlosIOUReport.reportID);
-                                    expect(carlosIOUAction.originalMessage.amount).toBe(amount / 4);
-                                    expect(carlosIOUAction.originalMessage.comment).toBe(comment);
-                                    expect(carlosIOUAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                    expect(Date.parse(carlosIOUCreatedAction.created)).toBeLessThan(Date.parse(carlosIOUAction.created));
-
-                                    // Jules DM should have three reportActions, the existing CREATED action, the existing IOU action, and a new pending IOU action
-                                    expect(_.size(julesReportActions)).toBe(3);
-                                    expect(julesReportActions[julesCreatedAction.reportActionID]).toStrictEqual(julesCreatedAction);
-                                    julesIOUCreatedAction = _.find(julesReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    julesIOUAction = _.find(
-                                        julesReportActions,
-                                        (reportAction) =>
-                                            reportAction.reportActionID !== julesCreatedAction.reportActionID && reportAction.reportActionID !== julesExistingIOUAction.reportActionID,
-                                    );
-                                    expect(julesIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(julesIOUAction.originalMessage.IOUReportID).toBe(julesIOUReport.reportID);
-                                    expect(julesIOUAction.originalMessage.amount).toBe(amount / 4);
-                                    expect(julesIOUAction.originalMessage.comment).toBe(comment);
-                                    expect(julesIOUAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                    expect(Date.parse(julesIOUCreatedAction.created)).toBeLessThan(Date.parse(julesIOUAction.created));
-
-                                    // Vit DM should have two reportActions – a pending CREATED action and a pending IOU action
-                                    expect(_.size(vitReportActions)).toBe(2);
-                                    vitCreatedAction = _.find(vitReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    vitIOUAction = _.find(vitReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    expect(vitCreatedAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(vitIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(vitIOUAction.originalMessage.IOUReportID).toBe(vitIOUReport.reportID);
-                                    expect(vitIOUAction.originalMessage.amount).toBe(amount / 4);
-                                    expect(vitIOUAction.originalMessage.comment).toBe(comment);
-                                    expect(vitIOUAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                    expect(Date.parse(vitCreatedAction.created)).toBeLessThan(Date.parse(vitIOUAction.created));
-
-                                    // Group chat should have two reportActions – a pending CREATED action and a pending IOU action w/ type SPLIT
-                                    expect(_.size(groupReportActions)).toBe(2);
-                                    groupCreatedAction = _.find(groupReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
-                                    groupIOUAction = _.find(groupReportActions, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    expect(groupCreatedAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(groupIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(groupIOUAction.originalMessage).not.toHaveProperty('IOUReportID');
-                                    expect(groupIOUAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.SPLIT);
-                                    expect(Date.parse(groupCreatedAction.created)).toBeLessThanOrEqual(Date.parse(groupIOUAction.created));
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    /* There should be 5 transactions
-                                     *   – one existing one with Jules
-                                     *   - one for each of the three IOU reports
-                                     *   - one on the group chat w/ deleted report
-                                     */
-                                    expect(_.size(allTransactions)).toBe(5);
-                                    expect(allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction.transactionID}`]).toBeTruthy();
-
-                                    carlosTransaction = _.find(allTransactions, (transaction) => transaction.transactionID === carlosIOUAction.originalMessage.IOUTransactionID);
-                                    julesTransaction = _.find(allTransactions, (transaction) => transaction.transactionID === julesIOUAction.originalMessage.IOUTransactionID);
-                                    vitTransaction = _.find(allTransactions, (transaction) => transaction.transactionID === vitIOUAction.originalMessage.IOUTransactionID);
-                                    groupTransaction = _.find(allTransactions, (transaction) => transaction.reportID === CONST.REPORT.SPLIT_REPORTID);
-
-                                    expect(carlosTransaction.reportID).toBe(carlosIOUReport.reportID);
-                                    expect(julesTransaction.reportID).toBe(julesIOUReport.reportID);
-                                    expect(vitTransaction.reportID).toBe(vitIOUReport.reportID);
-                                    expect(groupTransaction).toBeTruthy();
-
-                                    expect(carlosTransaction.amount).toBe(amount / 4);
-                                    expect(julesTransaction.amount).toBe(amount / 4);
-                                    expect(vitTransaction.amount).toBe(amount / 4);
-                                    expect(groupTransaction.amount).toBe(amount);
-
-                                    expect(carlosTransaction.comment.comment).toBe(comment);
-                                    expect(julesTransaction.comment.comment).toBe(comment);
-                                    expect(vitTransaction.comment.comment).toBe(comment);
-                                    expect(groupTransaction.comment.comment).toBe(comment);
-
-                                    expect(carlosTransaction.merchant).toBe(merchant);
-                                    expect(julesTransaction.merchant).toBe(merchant);
-                                    expect(vitTransaction.merchant).toBe(merchant);
-                                    expect(groupTransaction.merchant).toBe(merchant);
-
-                                    expect(carlosTransaction.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
-                                    expect(julesTransaction.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
-                                    expect(vitTransaction.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
-
-                                    expect(carlosTransaction.comment.originalTransactionID).toBe(groupTransaction.transactionID);
-                                    expect(julesTransaction.comment.originalTransactionID).toBe(groupTransaction.transactionID);
-                                    expect(vitTransaction.comment.originalTransactionID).toBe(groupTransaction.transactionID);
-
-                                    expect(carlosTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(julesTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(vitTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                    expect(groupTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-                                waitForCollectionCallback: true,
-                                callback: (allPersonalDetails) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(allPersonalDetails).toMatchObject({
-                                        [VIT_ACCOUNT_ID]: {
-                                            accountID: VIT_ACCOUNT_ID,
-                                            displayName: VIT_EMAIL,
-                                            login: VIT_EMAIL,
-                                        },
-                                    });
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(fetch.resume)
-                .then(waitForNetworkPromises)
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    _.each(allReports, (report) => {
-                                        if (!report.pendingFields) {
-                                            return;
-                                        }
-                                        _.each(report.pendingFields, (pendingField) => expect(pendingField).toBeFalsy());
-                                    });
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                waitForCollectionCallback: true,
-                                callback: (allReportActions) => {
-                                    Onyx.disconnect(connectionID);
-                                    _.each(allReportActions, (reportAction) => expect(reportAction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-                                    _.each(allTransactions, (transaction) => expect(transaction.pendingAction).toBeFalsy());
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-
-    describe('payMoneyRequestElsewhere', () => {
-        it('clears outstanding IOUReport', () => {
-            const amount = 10000;
-            const comment = 'Giv money plz';
-            let chatReport;
-            let iouReport;
-            let createIOUAction;
-            let payIOUAction;
-            let transaction;
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForBatchedUpdates()
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    expect(_.size(allReports)).toBe(3);
-
-                                    const chatReports = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-                                    chatReport = chatReports[0];
-                                    expect(chatReport).toBeTruthy();
-                                    expect(chatReport).toHaveProperty('reportID');
-                                    expect(chatReport).toHaveProperty('iouReportID');
-
-                                    iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    expect(iouReport).toBeTruthy();
-                                    expect(iouReport).toHaveProperty('reportID');
-                                    expect(iouReport).toHaveProperty('chatReportID');
-
-                                    expect(chatReport.iouReportID).toBe(iouReport.reportID);
-                                    expect(iouReport.chatReportID).toBe(chatReport.reportID);
-
-                                    expect(chatReport.pendingFields).toBeFalsy();
-                                    expect(iouReport.pendingFields).toBeFalsy();
-
-                                    // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.SUBMITTED);
-                                    // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                waitForCollectionCallback: true,
-                                callback: (allReportActions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-
-                                    createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    expect(createIOUAction).toBeTruthy();
-                                    expect(createIOUAction.originalMessage.IOUReportID).toBe(iouReport.reportID);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(_.size(allTransactions)).toBe(1);
-                                    transaction = _.find(allTransactions, (t) => t);
-                                    expect(transaction).toBeTruthy();
-                                    expect(transaction.amount).toBe(amount);
-                                    expect(transaction.reportID).toBe(iouReport.reportID);
-                                    expect(createIOUAction.originalMessage.IOUTransactionID).toBe(transaction.transactionID);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    fetch.pause();
-                    IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, chatReport, iouReport);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    expect(_.size(allReports)).toBe(3);
-
-                                    chatReport = _.find(allReports, (r) => r.type === CONST.REPORT.TYPE.CHAT);
-                                    iouReport = _.find(allReports, (r) => r.type === CONST.REPORT.TYPE.IOU);
-
-                                    expect(chatReport.iouReportID).toBeFalsy();
-
-                                    // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
-                                    // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                waitForCollectionCallback: true,
-                                callback: (allReportActions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`];
-                                    expect(_.size(reportActionsForIOUReport)).toBe(3);
-
-                                    payIOUAction = _.find(
-                                        reportActionsForIOUReport,
-                                        (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && ra.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
-                                    );
-                                    expect(payIOUAction).toBeTruthy();
-                                    expect(payIOUAction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(fetch.resume)
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    expect(_.size(allReports)).toBe(3);
-
-                                    chatReport = _.find(allReports, (r) => r.type === CONST.REPORT.TYPE.CHAT);
-                                    iouReport = _.find(allReports, (r) => r.type === CONST.REPORT.TYPE.IOU);
-
-                                    expect(chatReport.iouReportID).toBeFalsy();
-
-                                    // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
-                                    // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                waitForCollectionCallback: true,
-                                callback: (allReportActions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`];
-                                    expect(_.size(reportActionsForIOUReport)).toBe(3);
-
-                                    payIOUAction = _.find(
-                                        reportActionsForIOUReport,
-                                        (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && ra.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
-                                    );
-                                    expect(payIOUAction).toBeTruthy();
-                                    expect(payIOUAction.pendingAction).toBeFalsy();
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-
-    describe('edit money request', () => {
-        const amount = 10000;
-        const comment = '💸💸💸💸';
-        const merchant = 'NASDAQ';
-
-        afterEach(() => {
-            fetch.resume();
-        });
-
-        it('updates the IOU request and IOU report when offline', () => {
-            let thread = {};
-            let iouReport = {};
-            let iouAction = {};
-            let transaction = {};
-
-            fetch.pause();
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForBatchedUpdates()
-                .then(() => {
-                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    [iouAction] = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    transaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport);
-                    Onyx.set(`report_${thread.reportID}`, thread);
-                    return waitForBatchedUpdates();
-                })
-                .then(() => {
-                    IOU.editMoneyRequest(transaction, thread.reportID, {amount: 20000, comment: 'Double the amount!'});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    const updatedTransaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    expect(updatedTransaction.modifiedAmount).toBe(20000);
-                                    expect(updatedTransaction.comment).toMatchObject({comment: 'Double the amount!'});
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
-                                    const updatedAction = _.find(allActions, (reportAction) => !_.isEmpty(reportAction));
-                                    expect(updatedAction.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(updatedAction.originalMessage).toEqual(
-                                        expect.objectContaining({amount: 20000, newComment: 'Double the amount!', oldAmount: amount, oldComment: comment}),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    const updatedIOUReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    const updatedChatReport = _.find(allReports, (report) => report.reportID === iouReport.chatReportID);
-                                    expect(updatedIOUReport).toEqual(
-                                        expect.objectContaining({
-                                            total: 20000,
-                                            cachedTotal: '$200.00',
-                                            lastMessageHtml: 'requested $200.00',
-                                            lastMessageText: 'requested $200.00',
-                                        }),
-                                    );
-                                    expect(updatedChatReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: `${CARLOS_EMAIL} owes $200.00`,
-                                            lastMessageText: `${CARLOS_EMAIL} owes $200.00`,
-                                        }),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    fetch.resume();
-                });
-        });
-
-        it('resets the IOU request and IOU report when api returns an error', () => {
-            let thread = {};
-            let iouReport = {};
-            let iouAction = {};
-            let transaction = {};
-
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForBatchedUpdates()
-                .then(() => {
-                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    [iouReport] = _.filter(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    [iouAction] = _.filter(reportActionsForIOUReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    transaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport);
-                    Onyx.set(`report_${thread.reportID}`, thread);
-                    return waitForBatchedUpdates();
-                })
-                .then(() => {
-                    fetch.fail();
-                    IOU.editMoneyRequest(transaction, thread.reportID, {amount: 20000, comment: 'Double the amount!'});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
-
-                                    const updatedTransaction = _.find(allTransactions, (t) => !_.isEmpty(t));
-                                    expect(updatedTransaction.modifiedAmount).toBe(undefined);
-                                    expect(updatedTransaction.amount).toBe(10000);
-                                    expect(updatedTransaction.comment).toMatchObject({comment});
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
-                                    const updatedAction = _.find(allActions, (reportAction) => !_.isEmpty(reportAction));
-                                    expect(updatedAction.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(_.values(updatedAction.errors)).toEqual(expect.arrayContaining([['iou.error.genericEditFailureMessage', {isTranslated: false}]]));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    const updatedIOUReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    const updatedChatReport = _.find(allReports, (report) => report.reportID === iouReport.chatReportID);
-                                    expect(updatedIOUReport).toEqual(
-                                        expect.objectContaining({
-                                            total: 10000,
-                                            cachedTotal: '$100.00',
-                                            lastMessageHtml: `requested $${amount / 100}.00 for ${comment}`,
-                                            lastMessageText: `requested $${amount / 100}.00 for ${comment}`,
-                                        }),
-                                    );
-                                    expect(updatedChatReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: '',
-                                        }),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-
-    describe('pay expense report via ACH', () => {
-        const amount = 10000;
-        const comment = '💸💸💸💸';
-        const merchant = 'NASDAQ';
-
-        afterEach(() => {
-            fetch.resume();
-        });
-
-        it('updates the expense request and expense report when paid while offline', () => {
-            let expenseReport = {};
-            let chatReport = {};
-
-            fetch.pause();
-            Onyx.set(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
-            return waitForBatchedUpdates()
-                .then(() => {
-                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = _.find(allReports, (report) => report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.VBBA, chatReport, expenseReport);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
-                                    expect(_.values(allActions)).toEqual(
-                                        expect.arrayContaining([
-                                            expect.objectContaining({
-                                                message: expect.arrayContaining([
-                                                    expect.objectContaining({
-                                                        html: `paid $${amount / 100}.00 with Expensify`,
-                                                        text: `paid $${amount / 100}.00 with Expensify`,
-                                                    }),
-                                                ]),
-                                                originalMessage: expect.objectContaining({
-                                                    amount,
-                                                    paymentType: CONST.IOU.PAYMENT_TYPE.VBBA,
-                                                    type: 'pay',
-                                                }),
-                                            }),
-                                        ]),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    const updatedIOUReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-                                    const updatedChatReport = _.find(allReports, (report) => report.reportID === expenseReport.chatReportID);
-                                    expect(updatedIOUReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: `paid $${amount / 100}.00 with Expensify`,
-                                            lastMessageText: `paid $${amount / 100}.00 with Expensify`,
-                                            statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
-                                            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
-                                        }),
-                                    );
-                                    expect(updatedChatReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: `paid $${amount / 100}.00 with Expensify`,
-                                            lastMessageText: `paid $${amount / 100}.00 with Expensify`,
-                                        }),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-
-        it('shows an error when paying results in an error', () => {
-            let expenseReport = {};
-            let chatReport = {};
-
-            Onyx.set(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
-            return waitForBatchedUpdates()
-                .then(() => {
-                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = _.find(allReports, (report) => report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    fetch.fail();
-                    IOU.payMoneyRequest('ACH', chatReport, expenseReport);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
-                                waitForCollectionCallback: true,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
-                                    const erroredAction = _.find(_.values(allActions), (action) => !_.isEmpty(action.errors));
-                                    expect(_.values(erroredAction.errors)).toEqual(expect.arrayContaining([['iou.error.other', {isTranslated: false}]]));
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-
-    describe('deleteMoneyRequest', () => {
-        const amount = 10000;
-        const comment = 'Send me money please';
-        let chatReport;
-        let iouReport;
-        let createIOUAction;
-        let transaction;
-        let thread;
-        const TEST_USER_ACCOUNT_ID = 1;
-        const TEST_USER_LOGIN = 'test@test.com';
-        let IOU_REPORT_ID;
-        let reportActionID;
-        const REPORT_ACTION = {
-            actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
-            actorAccountID: TEST_USER_ACCOUNT_ID,
-            automatic: false,
-            avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
-            message: [{type: 'COMMENT', html: 'Testing a comment', text: 'Testing a comment', translationKey: ''}],
-            person: [{type: 'TEXT', style: 'strong', text: 'Test User'}],
-            shouldShow: true,
-        };
-
-        let reportActions;
-
-        beforeEach(async () => {
-            // Given mocks are cleared and helpers are set up
-            jest.clearAllMocks();
-            PusherHelper.setup();
-
-            // Given a test user is signed in with Onyx setup and some initial data
-            await TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN);
-            User.subscribeToUserEvents();
-            await waitForBatchedUpdates();
-            await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
-
-            // When an IOU request for money is made
-            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment);
-            await waitForBatchedUpdates();
-
-            // When fetching all reports from Onyx
-            const allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT,
-                    waitForCollectionCallback: true,
-                    callback: (reports) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reports);
-                    },
-                });
-            });
-
-            // Then we should have exactly 3 reports
-            expect(_.size(allReports)).toBe(3);
-
-            // Then one of them should be a chat report with relevant properties
-            chatReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
-            expect(chatReport).toBeTruthy();
-            expect(chatReport).toHaveProperty('reportID');
-            expect(chatReport).toHaveProperty('iouReportID');
-
-            // Then one of them should be an IOU report with relevant properties
-            iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-
-            // Then their IDs should reference each other
-            expect(chatReport.iouReportID).toBe(iouReport.reportID);
-            expect(iouReport.chatReportID).toBe(chatReport.reportID);
-
-            // Storing IOU Report ID for further reference
-            IOU_REPORT_ID = chatReport.iouReportID;
-
-            await waitForBatchedUpdates();
-
-            // When fetching all report actions from Onyx
-            const allReportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                    waitForCollectionCallback: true,
-                    callback: (actions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actions);
-                    },
-                });
-            });
-
-            // Then we should find an IOU action with specific properties
-            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction).toBeTruthy();
-            expect(createIOUAction.originalMessage.IOUReportID).toBe(iouReport.reportID);
-
-            // When fetching all transactions from Onyx
-            const allTransactions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                    waitForCollectionCallback: true,
-                    callback: (transactions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(transactions);
-                    },
-                });
-            });
-
-            // Then we should find a specific transaction with relevant properties
-            transaction = _.find(allTransactions, (t) => t);
-            expect(transaction).toBeTruthy();
-            expect(transaction.amount).toBe(amount);
-            expect(transaction.reportID).toBe(iouReport.reportID);
-            expect(createIOUAction.originalMessage.IOUTransactionID).toBe(transaction.transactionID);
-        });
-
-        afterEach(PusherHelper.teardown);
-
-        it('delete a money request (IOU Action and transaction) successfully', async () => {
-            // Given the fetch operations are paused and a money request is initiated
-            fetch.pause();
-
-            // When the money request is deleted
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
-            await waitForBatchedUpdates();
-
-            // Then we check if the IOU report action is removed from the report actions collection
-            let reportActionsForReport = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (actionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actionsForReport);
-                    },
-                });
-            });
-
-            createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            // Then the IOU Action should be truthy for offline support.
-            expect(createIOUAction).toBeTruthy();
-
-            // Then we check if the transaction is removed from the transactions collection
-            const t = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-                    waitForCollectionCallback: true,
-                    callback: (transactionResult) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(transactionResult);
-                    },
-                });
-            });
-
-            expect(t).toBeFalsy();
-
-            // Given fetch operations are resumed
-            fetch.resume();
-            await waitForBatchedUpdates();
-
-            // Then we recheck the IOU report action from the report actions collection
-            reportActionsForReport = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (actionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actionsForReport);
-                    },
-                });
-            });
-
-            createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction).toBeFalsy();
-
-            // Then we recheck the transaction from the transactions collection
-            const tr = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
-                    waitForCollectionCallback: true,
-                    callback: (transactionResult) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(transactionResult);
-                    },
-                });
-            });
-
-            expect(tr).toBeFalsy();
-        });
-
-        it('delete the IOU report when there are no visible comments left in the IOU report', async () => {
-            // Given an IOU report and a paused fetch state
-            fetch.pause();
-
-            // When the IOU money request is deleted
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
-            await waitForBatchedUpdates();
-
-            let report = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (res) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(res);
-                    },
-                });
-            });
-
-            // Then the report should be truthy for offline support
-            expect(report).toBeTruthy();
-
-            // Given the resumed fetch state
-            fetch.resume();
-            await waitForBatchedUpdates();
-
-            report = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (res) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(res);
-                    },
-                });
-            });
-
-            // Then the report should be falsy so that there is no trace of the money request.
-            expect(report).toBeFalsy();
-        });
-
-        it('does not delete the IOU report when there are visible comments left in the IOU report', async () => {
-            // Given the initial setup is completed
-            await waitForBatchedUpdates();
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-
-            // When a comment is added to the IOU report
-            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
-            await waitForBatchedUpdates();
-
-            // Then verify that the comment is correctly added
-            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
-            reportActionID = resultAction.reportActionID;
-
-            expect(resultAction.message).toEqual(REPORT_ACTION.message);
-            expect(resultAction.person).toEqual(REPORT_ACTION.person);
-            expect(resultAction.pendingAction).toBeUndefined();
-
-            await waitForBatchedUpdates();
-
-            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
-            expect(_.size(reportActions)).toBe(3);
-
-            // Then check the loading state of our action
-            const resultActionAfterUpdate = reportActions[reportActionID];
-            expect(resultActionAfterUpdate.pendingAction).toBeUndefined();
-
-            // When we attempt to delete a money request from the IOU report
-            fetch.pause();
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then expect that the IOU report still exists
-            let allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT,
-                    waitForCollectionCallback: true,
-                    callback: (reports) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reports);
-                    },
-                });
-            });
-
-            await waitForBatchedUpdates();
-
-            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-
-            // Given the resumed fetch state
-            fetch.resume();
-
-            allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT,
-                    waitForCollectionCallback: true,
-                    callback: (reports) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reports);
-                    },
-                });
-            });
-            // Then expect that the IOU report still exists
-            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-        });
-
-        it('delete the transaction thread if there are no visible comments in the thread', async () => {
-            // Given all promises are resolved
-            await waitForBatchedUpdates();
-            jest.advanceTimersByTime(10);
-
-            // Given a transaction thread
-            thread = ReportUtils.buildTransactionThread(createIOUAction, {reportID: IOU_REPORT_ID});
-
-            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                callback: (val) => (reportActions = val),
-            });
-
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-
-            // Given User logins from the participant accounts
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
-
-            // When Opening a thread report with the given details
-            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction.reportActionID);
-            await waitForBatchedUpdates();
-
-            // Then The iou action has the transaction report id as a child report ID
-            const allReportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                    waitForCollectionCallback: true,
-                    callback: (actions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actions);
-                    },
-                });
-            });
-            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction.childReportID).toBe(thread.reportID);
-
-            await waitForBatchedUpdates();
-
-            // Given Fetch is paused and timers have advanced
-            fetch.pause();
-            jest.advanceTimersByTime(10);
-
-            // When Deleting a money request
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then The report for the given thread ID does not exist
-            let report = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reportData);
-                    },
-                });
-            });
-
-            expect(report).toBeFalsy();
-            fetch.resume();
-
-            // Then After resuming fetch, the report for the given thread ID still does not exist
-            report = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reportData);
-                    },
-                });
-            });
-
-            expect(report).toBeFalsy();
-        });
-
-        it('delete the transaction thread if there are only changelogs (i.e. MODIFIEDEXPENSE actions) in the thread', async () => {
-            // Given all promises are resolved
-            await waitForBatchedUpdates();
-            jest.advanceTimersByTime(10);
-
-            // Given a transaction thread
-            thread = ReportUtils.buildTransactionThread(createIOUAction, {reportID: IOU_REPORT_ID});
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                callback: (val) => (reportActions = val),
-            });
-
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-
-            // Given User logins from the participant accounts
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
-
-            // When Opening a thread report with the given details
-            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction.reportActionID);
-            await waitForBatchedUpdates();
-
-            // Then The iou action has the transaction report id as a child report ID
-            const allReportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                    waitForCollectionCallback: true,
-                    callback: (actions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actions);
-                    },
-                });
-            });
-            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction.childReportID).toBe(thread.reportID);
-
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-            IOU.editMoneyRequest(transaction, thread.reportID, {amount: 20000, comment: 'Double the amount!'});
-            await waitForBatchedUpdates();
-
-            // Verify there are two actions (created + changelog)
-            expect(_.size(reportActions)).toBe(2);
-
-            // Fetch the updated IOU Action from Onyx
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                        resolve();
-                    },
-                });
-            });
-
-            // When Deleting a money request
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then, the report for the given thread ID does not exist
-            const report = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reportData);
-                    },
-                });
-            });
-
-            expect(report).toBeFalsy();
-        });
-
-        it('does not delete the transaction thread if there are visible comments in the thread', async () => {
-            // Given initial environment is set up
-            await waitForBatchedUpdates();
-
-            // Given a transaction thread
-            thread = ReportUtils.buildTransactionThread(createIOUAction, {reportID: IOU_REPORT_ID});
-
-            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
-            jest.advanceTimersByTime(10);
-            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction.reportActionID);
-            await waitForBatchedUpdates();
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (report) => {
-                        Onyx.disconnect(connectionID);
-                        expect(report).toBeTruthy();
-                        resolve();
-                    },
-                });
-            });
-
-            jest.advanceTimersByTime(10);
-
-            // When a comment is added
-            Report.addComment(thread.reportID, 'Testing a comment');
-            await waitForBatchedUpdates();
-
-            // Then comment details should match the expected report action
-            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
-            reportActionID = resultAction.reportActionID;
-            expect(resultAction.message).toEqual(REPORT_ACTION.message);
-            expect(resultAction.person).toEqual(REPORT_ACTION.person);
-
-            await waitForBatchedUpdates();
-
-            // Then the report should have 2 actions
-            expect(_.size(reportActions)).toBe(2);
-            const resultActionAfter = reportActions[reportActionID];
-            expect(resultActionAfter.pendingAction).toBeUndefined();
-
-            fetch.pause();
-            // When deleting money request
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then the transaction thread report should still exist
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (report) => {
-                        Onyx.disconnect(connectionID);
-                        expect(report).toBeTruthy();
-                        resolve();
-                    },
-                });
-            });
-
-            // When fetch resumes
-            // Then the transaction thread report should still exist
-            fetch.resume();
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (report) => {
-                        Onyx.disconnect(connectionID);
-                        expect(report).toBeTruthy();
-                        resolve();
-                    },
-                });
-            });
-        });
-
-        it('update the moneyRequestPreview to show [Deleted request] when appropriate', async () => {
-            await waitForBatchedUpdates();
-
-            // Given a thread report
-
-            jest.advanceTimersByTime(10);
-            thread = ReportUtils.buildTransactionThread(createIOUAction, {reportID: IOU_REPORT_ID});
-
-            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
-            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction.reportActionID);
-
-            await waitForBatchedUpdates();
-
-            const allReportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                    waitForCollectionCallback: true,
-                    callback: (actions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actions);
-                    },
-                });
-            });
-
-            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction.childReportID).toBe(thread.reportID);
-
-            await waitForBatchedUpdates();
-
-            // Given an added comment to the thread report
-
-            jest.advanceTimersByTime(10);
-
-            Report.addComment(thread.reportID, 'Testing a comment');
-            await waitForBatchedUpdates();
-
-            // Fetch the updated IOU Action from Onyx due to addition of comment to transaction thread.
-            // This needs to be fetched as `deleteMoneyRequest` depends on `childVisibleActionCount` in `createIOUAction`.
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                        resolve();
-                    },
-                });
-            });
-
-            let resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
-            reportActionID = resultAction.reportActionID;
-
-            expect(resultAction.message).toEqual(REPORT_ACTION.message);
-            expect(resultAction.person).toEqual(REPORT_ACTION.person);
-            expect(resultAction.pendingAction).toBeUndefined();
-
-            await waitForBatchedUpdates();
-
-            // Verify there are three actions (created + addcomment) and our optimistic comment has been removed
-            expect(_.size(reportActions)).toBe(2);
-
-            let resultActionAfterUpdate = reportActions[reportActionID];
-
-            // Verify that our action is no longer in the loading state
-            expect(resultActionAfterUpdate.pendingAction).toBeUndefined();
-
-            await waitForBatchedUpdates();
-
-            // Given an added comment to the IOU report
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-
-            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
-            await waitForBatchedUpdates();
-
-            resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
-            reportActionID = resultAction.reportActionID;
-
-            expect(resultAction.message).toEqual(REPORT_ACTION.message);
-            expect(resultAction.person).toEqual(REPORT_ACTION.person);
-            expect(resultAction.pendingAction).toBeUndefined();
-
-            await waitForBatchedUpdates();
-
-            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
-            expect(_.size(reportActions)).toBe(3);
-
-            resultActionAfterUpdate = reportActions[reportActionID];
-
-            // Verify that our action is no longer in the loading state
-            expect(resultActionAfterUpdate.pendingAction).toBeUndefined();
-
-            fetch.pause();
-            // When we delete the money request
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then we expect the moneyRequestPreview to show [Deleted request]
-
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                        expect(createIOUAction.message[0].isDeletedParentAction).toBeTruthy();
-                        resolve();
-                    },
-                });
-            });
-
-            // When we resume fetch
-
-            fetch.resume();
-
-            // Then we expect the moneyRequestPreview to show [Deleted request]
-
-            await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
-                    waitForCollectionCallback: true,
-                    callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-                        expect(createIOUAction.message[0].isDeletedParentAction).toBeTruthy();
-                        resolve();
-                    },
-                });
-            });
-        });
-
-        it('update IOU report and reportPreview with new totals and messages if the IOU report is not deleted', async () => {
-            await waitForBatchedUpdates();
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
-                callback: (val) => (iouReport = val),
-            });
-            await waitForBatchedUpdates();
-
-            // Given a second money request in addition to the first one
-
-            jest.advanceTimersByTime(10);
-            const amount2 = 20000;
-            const comment2 = 'Send me money please 2';
-            IOU.requestMoney(chatReport, amount2, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment2);
-
-            await waitForBatchedUpdates();
-
-            // Then we expect the IOU report and reportPreview to update with new totals
-
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-            expect(iouReport.total).toBe(30000);
-
-            const ioupreview = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
-            expect(ioupreview).toBeTruthy();
-            expect(ioupreview.message[0].text).toBe('rory@expensifail.com owes $300.00');
-
-            // When we delete the first money request
-            fetch.pause();
-            jest.advanceTimersByTime(10);
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            await waitForBatchedUpdates();
-
-            // Then we expect the IOU report and reportPreview to update with new totals
-
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-            expect(iouReport.total).toBe(20000);
-
-            // When we resume fetch
-            fetch.resume();
-
-            // Then we expect the IOU report and reportPreview to update with new totals
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-            expect(iouReport.total).toBe(20000);
-        });
-
-        it('navigate the user correctly to the iou Report when appropriate', async () => {
-            await waitForBatchedUpdates();
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            // Given an added comment to the iou report
-
-            jest.advanceTimersByTime(10);
-
-            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
-            await waitForBatchedUpdates();
-
-            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
-            reportActionID = resultAction.reportActionID;
-
-            expect(resultAction.message).toEqual(REPORT_ACTION.message);
-            expect(resultAction.person).toEqual(REPORT_ACTION.person);
-
-            await waitForBatchedUpdates();
-
-            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
-            expect(_.size(reportActions)).toBe(3);
-
-            await waitForBatchedUpdates();
-
-            // Given a thread report
-
-            jest.advanceTimersByTime(10);
-            thread = ReportUtils.buildTransactionThread(createIOUAction, {reportID: IOU_REPORT_ID});
-
-            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-            Onyx.connect({
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                callback: (val) => (reportActions = val),
-            });
-            await waitForBatchedUpdates();
-
-            jest.advanceTimersByTime(10);
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
-            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction.reportActionID);
-            await waitForBatchedUpdates();
-
-            const allReportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                    waitForCollectionCallback: true,
-                    callback: (actions) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(actions);
-                    },
-                });
-            });
-
-            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
-            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
-            expect(createIOUAction.childReportID).toBe(thread.reportID);
-
-            await waitForBatchedUpdates();
-
-            // When we delete the money request in SingleTransactionView and we should not delete the IOU report
-
-            fetch.pause();
-
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
-            await waitForBatchedUpdates();
-
-            let allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT,
-                    waitForCollectionCallback: true,
-                    callback: (reports) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reports);
-                    },
-                });
-            });
-
-            await waitForBatchedUpdates();
-
-            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-
-            fetch.resume();
-
-            allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: ONYXKEYS.COLLECTION.REPORT,
-                    waitForCollectionCallback: true,
-                    callback: (reports) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(reports);
-                    },
-                });
-            });
-
-            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
-            expect(iouReport).toBeTruthy();
-            expect(iouReport).toHaveProperty('reportID');
-            expect(iouReport).toHaveProperty('chatReportID');
-
-            // Then we expect to navigate to the iou report
-
-            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(IOU_REPORT_ID));
-        });
-
-        it('navigate the user correctly to the chat Report when appropriate', () => {
-            // When we delete the money request and we should delete the IOU report
-            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
-            // Then we expect to navigate to the chat report
-            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(chatReport.reportID));
-        });
-    });
-
-    describe('submitReport', () => {
-        it('correctly submits a report', () => {
-            const amount = 10000;
-            const comment = '💸💸💸💸';
-            const merchant = 'NASDAQ';
-            let expenseReport = {};
-            let chatReport = {};
-            return waitForBatchedUpdates()
-                .then(() => {
-                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = _.find(allReports, (report) => report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.requestMoney(
-                        chatReport,
-                        amount,
-                        CONST.CURRENCY.USD,
-                        '',
-                        merchant,
-                        RORY_EMAIL,
-                        RORY_ACCOUNT_ID,
-                        {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID, isPolicyExpenseChat: true, reportID: chatReport.reportID},
-                        comment,
-                    );
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-                                    Onyx.merge(`report_${expenseReport.reportID}`, {
-                                        statusNum: 0,
-                                        stateNum: 0,
-                                    });
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-
-                                    // Verify report is a draft
-                                    expect(expenseReport.stateNum).toBe(0);
-                                    expect(expenseReport.statusNum).toBe(0);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.submitReport(expenseReport);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-
-                                    // Report was submitted correctly
-                                    expect(expenseReport.stateNum).toBe(1);
-                                    expect(expenseReport.statusNum).toBe(1);
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-        it('correctly implements error handling', () => {
-            const amount = 10000;
-            const comment = '💸💸💸💸';
-            const merchant = 'NASDAQ';
-            let expenseReport = {};
-            let chatReport = {};
-            return waitForBatchedUpdates()
-                .then(() => {
-                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = _.find(allReports, (report) => report.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    IOU.requestMoney(
-                        chatReport,
-                        amount,
-                        CONST.CURRENCY.USD,
-                        '',
-                        merchant,
-                        RORY_EMAIL,
-                        RORY_ACCOUNT_ID,
-                        {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID, isPolicyExpenseChat: true, reportID: chatReport.reportID},
-                        comment,
-                    );
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-                                    Onyx.merge(`report_${expenseReport.reportID}`, {
-                                        statusNum: 0,
-                                        stateNum: 0,
-                                    });
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-
-                                    // Verify report is a draft
-                                    expect(expenseReport.stateNum).toBe(0);
-                                    expect(expenseReport.statusNum).toBe(0);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    fetch.fail();
-                    IOU.submitReport(expenseReport);
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise((resolve) => {
-                            const connectionID = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.EXPENSE);
-
-                                    // Report was submitted with some fail
-                                    expect(expenseReport.stateNum).toBe(0);
-                                    expect(expenseReport.statusNum).toBe(0);
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-});
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
new file mode 100644
index 000000000000..3298cd51c9f1
--- /dev/null
+++ b/tests/actions/IOUTest.ts
@@ -0,0 +1,3225 @@
+import isEqual from 'lodash/isEqual';
+import Onyx from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OptimisticChatReport} from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import * as IOU from '@src/libs/actions/IOU';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as PolicyActions from '@src/libs/actions/Policy';
+import * as Report from '@src/libs/actions/Report';
+import * as ReportActions from '@src/libs/actions/ReportActions';
+import * as User from '@src/libs/actions/User';
+import DateUtils from '@src/libs/DateUtils';
+import Navigation from '@src/libs/Navigation/Navigation';
+import * as NumberUtils from '@src/libs/NumberUtils';
+import * as PersonalDetailsUtils from '@src/libs/PersonalDetailsUtils';
+import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {IOUMessage, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
+import type {ReportActionBase} from '@src/types/onyx/ReportAction';
+import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import PusherHelper from '../utils/PusherHelper';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForNetworkPromises from '../utils/waitForNetworkPromises';
+
+jest.mock('@src/libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    dismissModal: jest.fn(),
+    dismissModalWithReport: jest.fn(),
+    goBack: jest.fn(),
+}));
+
+const CARLOS_EMAIL = 'cmartins@expensifail.com';
+const CARLOS_ACCOUNT_ID = 1;
+const JULES_EMAIL = 'jules@expensifail.com';
+const JULES_ACCOUNT_ID = 2;
+const RORY_EMAIL = 'rory@expensifail.com';
+const RORY_ACCOUNT_ID = 3;
+const VIT_EMAIL = 'vit@expensifail.com';
+const VIT_ACCOUNT_ID = 4;
+
+OnyxUpdateManager();
+describe('actions/IOU', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(() => {
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+        global.fetch = TestHelper.getGlobalFetchMock();
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    describe('requestMoney', () => {
+        it('creates new chat if needed', () => {
+            const amount = 10000;
+            const comment = 'Giv money plz';
+            const merchant = 'KFC';
+            let iouReportID: string | undefined;
+            let createdAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let transactionID: string | undefined;
+            let transactionThread: OnyxEntry<OnyxTypes.Report>;
+            let transactionThreadCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+            return (
+                waitForBatchedUpdates()
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // A chat report, a transaction thread, and an iou report should be created
+                                        const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                        const iouReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                        expect(Object.keys(chatReports).length).toBe(2);
+                                        expect(Object.keys(iouReports).length).toBe(1);
+                                        const chatReport = chatReports[0];
+                                        const transactionThreadReport = chatReports[1];
+                                        const iouReport = iouReports[0];
+                                        iouReportID = iouReport?.reportID;
+                                        transactionThread = transactionThreadReport;
+
+                                        expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+                                        // They should be linked together
+                                        expect(chatReport?.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
+                                        expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // The IOU report should have a CREATED action and IOU action
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                        const createdActions = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                            (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                        );
+                                        const iouActions = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                            (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                        );
+                                        expect(Object.values(createdActions).length).toBe(1);
+                                        expect(Object.values(iouActions).length).toBe(1);
+                                        createdAction = createdActions?.[0] ?? null;
+                                        iouAction = iouActions?.[0] ?? null;
+
+                                        // The CREATED action should not be created after the IOU action
+                                        expect(Date.parse(createdAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
+
+                                        // The IOUReportID should be correct
+                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+
+                                        // The comment should be included in the IOU action
+                                        expect(iouAction.originalMessage.comment).toBe(comment);
+
+                                        // The amount in the IOU action should be correct
+                                        expect(iouAction.originalMessage.amount).toBe(amount);
+
+                                        // The IOU type should be correct
+                                        expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+
+                                        // Both actions should be pending
+                                        expect(createdAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForTransactionThread) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // The transaction thread should have a CREATED action
+                                        expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(1);
+                                        const createdActions = Object.values(reportActionsForTransactionThread ?? {}).filter(
+                                            (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                        );
+                                        expect(Object.values(createdActions).length).toBe(1);
+                                        transactionThreadCreatedAction = createdActions[0];
+
+                                        expect(transactionThreadCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should be one transaction
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                        const transaction = Object.values(allTransactions ?? []).find((t) => !isEmptyObject(t));
+                                        transactionID = transaction?.transactionID;
+
+                                        // The transaction should be attached to the IOU report
+                                        expect(transaction?.reportID).toBe(iouReportID);
+
+                                        // Its amount should match the amount of the request
+                                        expect(transaction?.amount).toBe(amount);
+
+                                        // The comment should be correct
+                                        expect(transaction?.comment.comment).toBe(comment);
+
+                                        // It should be pending
+                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        // The transactionID on the iou action should match the one from the transactions collection
+                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+
+                                        expect(transaction?.merchant).toBe(merchant);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.resume)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (transaction) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(transaction?.pendingAction).toBeFalsy();
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+            );
+        });
+
+        it('updates existing chat report if there is one', () => {
+            const amount = 10000;
+            const comment = 'Giv money plz';
+            let chatReport: OnyxTypes.Report = {
+                reportID: '1234',
+                type: CONST.REPORT.TYPE.CHAT,
+                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+            };
+            const createdAction: OnyxTypes.ReportAction = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                created: DateUtils.getDBTime(),
+            };
+            let iouReportID: string | undefined;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let transactionID: string | undefined;
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            return (
+                Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, chatReport)
+                    .then(() =>
+                        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, {
+                            [createdAction.reportActionID]: createdAction,
+                        }),
+                    )
+                    .then(() => {
+                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                        return waitForBatchedUpdates();
+                    })
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // The same chat report should be reused, a transaction thread and an IOU report should be created
+                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+                                        expect(Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT)?.reportID).toBe(chatReport.reportID);
+                                        chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? chatReport;
+                                        const iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                        iouReportID = iouReport?.reportID;
+
+                                        expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+                                        // They should be linked together
+                                        expect(chatReport.iouReportID).toBe(iouReportID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (allIOUReportActions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        iouCreatedAction =
+                                            Object.values(allIOUReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
+                                        iouAction =
+                                            Object.values(allIOUReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                            ) ?? null;
+
+                                        // The CREATED action should not be created after the IOU action
+                                        expect(Date.parse(iouCreatedAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
+
+                                        // The IOUReportID should be correct
+                                        expect(iouAction?.originalMessage?.IOUReportID).toBe(iouReportID);
+
+                                        // The comment should be included in the IOU action
+                                        expect(iouAction?.originalMessage?.comment).toBe(comment);
+
+                                        // The amount in the IOU action should be correct
+                                        expect(iouAction?.originalMessage?.amount).toBe(amount);
+
+                                        // The IOU action type should be correct
+                                        expect(iouAction?.originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+
+                                        // The IOU action should be pending
+                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should be one transaction
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                        const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
+                                        transactionID = transaction?.transactionID;
+
+                                        // The transaction should be attached to the IOU report
+                                        expect(transaction?.reportID).toBe(iouReportID);
+
+                                        // Its amount should match the amount of the request
+                                        expect(transaction?.amount).toBe(amount);
+
+                                        // The comment should be correct
+                                        expect(transaction?.comment.comment).toBe(comment);
+
+                                        expect(transaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+
+                                        // It should be pending
+                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        // The transactionID on the iou action should match the one from the transactions collection
+                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.resume)
+                    .then(waitForBatchedUpdates)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                    waitForCollectionCallback: true,
+                                    callback: (transaction) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(transaction?.pendingAction).toBeFalsy();
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+            );
+        });
+
+        it('updates existing IOU report if there is one', () => {
+            const amount = 10000;
+            const comment = 'Giv money plz';
+            const chatReportID = '1234';
+            const iouReportID = '5678';
+            let chatReport: OnyxEntry<OnyxTypes.Report> = {
+                reportID: chatReportID,
+                type: CONST.REPORT.TYPE.CHAT,
+                iouReportID,
+                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+            };
+            const createdAction: OnyxTypes.ReportAction = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                created: DateUtils.getDBTime(),
+            };
+            const existingTransaction: OnyxTypes.Transaction = {
+                transactionID: NumberUtils.rand64(),
+                amount: 1000,
+                comment: {
+                    comment: 'Existing transaction',
+                },
+                created: DateUtils.getDBTime(),
+                currency: CONST.CURRENCY.USD,
+                merchant: '',
+                reportID: '',
+            };
+            let iouReport: OnyxEntry<OnyxTypes.Report> = {
+                reportID: iouReportID,
+                chatReportID,
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: RORY_ACCOUNT_ID,
+                managerID: CARLOS_ACCOUNT_ID,
+                currency: CONST.CURRENCY.USD,
+                total: existingTransaction.amount,
+            };
+            const iouAction: OnyxEntry<OnyxTypes.ReportAction> = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                actorAccountID: RORY_ACCOUNT_ID,
+                created: DateUtils.getDBTime(),
+                originalMessage: {
+                    IOUReportID: iouReportID,
+                    IOUTransactionID: existingTransaction.transactionID,
+                    amount: existingTransaction.amount,
+                    currency: CONST.CURRENCY.USD,
+                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                    participantAccountIDs: [RORY_ACCOUNT_ID, CARLOS_ACCOUNT_ID],
+                },
+            };
+            let newIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let newTransaction: OnyxEntry<OnyxTypes.Transaction>;
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            return (
+                Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, chatReport)
+                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, iouReport))
+                    .then(() =>
+                        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {
+                            [createdAction.reportActionID]: createdAction,
+                            [iouAction.reportActionID]: iouAction,
+                        }),
+                    )
+                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${existingTransaction.transactionID}`, existingTransaction))
+                    .then(() => {
+                        if (chatReport) {
+                            IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                        }
+                        return waitForBatchedUpdates();
+                    })
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // No new reports should be created
+                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+                                        expect(Object.values(allReports ?? {}).find((report) => report?.reportID === chatReportID)).toBeTruthy();
+                                        expect(Object.values(allReports ?? {}).find((report) => report?.reportID === iouReportID)).toBeTruthy();
+
+                                        chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? null;
+                                        iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                        // The total on the iou report should be updated
+                                        expect(iouReport?.total).toBe(11000);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                        newIOUAction =
+                                            Object.values(reportActionsForIOUReport ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU =>
+                                                    reportAction?.reportActionID !== createdAction.reportActionID && reportAction?.reportActionID !== iouAction?.reportActionID,
+                                            ) ?? null;
+
+                                        // The IOUReportID should be correct
+                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+
+                                        // The comment should be included in the IOU action
+                                        expect(newIOUAction?.originalMessage.comment).toBe(comment);
+
+                                        // The amount in the IOU action should be correct
+                                        expect(newIOUAction?.originalMessage.amount).toBe(amount);
+
+                                        // The type of the IOU action should be correct
+                                        expect(newIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+
+                                        // The IOU action should be pending
+                                        expect(newIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should be two transactions
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(2);
+
+                                        newTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.transactionID !== existingTransaction.transactionID) ?? null;
+
+                                        expect(newTransaction?.reportID).toBe(iouReportID);
+                                        expect(newTransaction?.amount).toBe(amount);
+                                        expect(newTransaction?.comment.comment).toBe(comment);
+                                        expect(newTransaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+                                        expect(newTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        // The transactionID on the iou action should match the one from the transactions collection
+                                        expect((newIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(newTransaction?.transactionID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.resume)
+                    .then(waitForNetworkPromises)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+            );
+        });
+
+        it('correctly implements RedBrickRoad error handling', () => {
+            const amount = 10000;
+            const comment = 'Giv money plz';
+            let chatReportID: string | undefined;
+            let iouReportID: string | undefined;
+            let createdAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let transactionID: string;
+            let transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
+            let transactionThreadAction: OnyxEntry<OnyxTypes.ReportAction>;
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+            return (
+                waitForBatchedUpdates()
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // A chat report, transaction thread and an iou report should be created
+                                        const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                        const iouReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                        expect(Object.values(chatReports).length).toBe(2);
+                                        expect(Object.values(iouReports).length).toBe(1);
+                                        const chatReport = chatReports[0];
+                                        chatReportID = chatReport?.reportID;
+                                        transactionThreadReport = chatReports[1];
+
+                                        const iouReport = iouReports[0];
+                                        iouReportID = iouReport?.reportID;
+
+                                        expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+                                        // They should be linked together
+                                        expect(chatReport?.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
+                                        expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // The chat report should have a CREATED action and IOU action
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                        const createdActions =
+                                            Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
+                                        const iouActions =
+                                            Object.values(reportActionsForIOUReport ?? {}).filter(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                            ) ?? null;
+                                        expect(Object.values(createdActions).length).toBe(1);
+                                        expect(Object.values(iouActions).length).toBe(1);
+                                        createdAction = createdActions[0];
+                                        iouAction = iouActions[0];
+
+                                        // The CREATED action should not be created after the IOU action
+                                        expect(Date.parse(createdAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? {}));
+
+                                        // The IOUReportID should be correct
+                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+
+                                        // The comment should be included in the IOU action
+                                        expect(iouAction.originalMessage.comment).toBe(comment);
+
+                                        // The amount in the IOU action should be correct
+                                        expect(iouAction.originalMessage.amount).toBe(amount);
+
+                                        // The type should be correct
+                                        expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+
+                                        // Both actions should be pending
+                                        expect(createdAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should be one transaction
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                        const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
+                                        transactionID = transaction?.transactionID ?? '';
+
+                                        expect(transaction?.reportID).toBe(iouReportID);
+                                        expect(transaction?.amount).toBe(amount);
+                                        expect(transaction?.comment.comment).toBe(comment);
+                                        expect(transaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        // The transactionID on the iou action should match the one from the transactions collection
+                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then((): Promise<unknown> => {
+                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                        fetch.fail();
+                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                        return fetch.resume() as Promise<unknown>;
+                    })
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForIOUReport) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                        iouAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (reportActionsForTransactionThread) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(3);
+                                        transactionThreadAction =
+                                            Object.values(reportActionsForTransactionThread?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`] ?? {}).find(
+                                                (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                            ) ?? null;
+                                        expect(transactionThreadAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (transaction) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(transaction?.pendingAction).toBeFalsy();
+                                        expect(transaction?.errors).toBeTruthy();
+                                        expect(Object.values(transaction?.errors ?? {})[0]).toEqual(expect.arrayContaining(['iou.error.genericCreateFailureMessage', {isTranslated: false}]));
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // If the user clears the errors on the IOU action
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                ReportActions.clearReportActionErrors(iouReportID ?? '', iouAction);
+                                ReportActions.clearReportActionErrors(transactionThreadReport?.reportID ?? '', transactionThreadAction);
+                                resolve();
+                            }),
+                    )
+
+                    // Then the reportAction should be removed from Onyx
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (reportActionsForReport) => {
+                                        Onyx.disconnect(connectionID);
+                                        iouAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        expect(iouAction).toBeFalsy();
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // Along with the associated transaction
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                    waitForCollectionCallback: false,
+                                    callback: (transaction) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(transaction).toBeFalsy();
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // If a user clears the errors on the CREATED action (which, technically are just errors on the report)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                Report.deleteReport(chatReportID ?? '');
+                                Report.deleteReport(transactionThreadReport?.reportID ?? '');
+                                resolve();
+                            }),
+                    )
+
+                    // Then the report should be deleted
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allReports ?? {}).forEach((report) => expect(report).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // All reportActions should also be deleted
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: false,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allReportActions ?? {}).forEach((reportAction) => expect(reportAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // All transactions should also be deleted
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+
+                    // Cleanup
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.succeed)
+            );
+        });
+    });
+
+    describe('split bill', () => {
+        it('creates and updates new chats and IOUs as needed', () => {
+            jest.setTimeout(10 * 1000);
+            /*
+             * Given that:
+             *   - Rory and Carlos have chatted before
+             *   - Rory and Jules have chatted before and have an active IOU report
+             *   - Rory and Vit have never chatted together before
+             *   - There is no existing group chat with the four of them
+             */
+            const amount = 400;
+            const comment = 'Yes, I am splitting a bill for $4 USD';
+            const merchant = 'Yema Kitchen';
+            let carlosChatReport: OnyxEntry<OnyxTypes.Report> = {
+                reportID: NumberUtils.rand64(),
+                type: CONST.REPORT.TYPE.CHAT,
+                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+            };
+            const carlosCreatedAction: OnyxEntry<OnyxTypes.ReportAction> = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                created: DateUtils.getDBTime(),
+                reportID: carlosChatReport.reportID,
+            };
+            const julesIOUReportID = NumberUtils.rand64();
+            let julesChatReport: OnyxEntry<OnyxTypes.Report> = {
+                reportID: NumberUtils.rand64(),
+                type: CONST.REPORT.TYPE.CHAT,
+                iouReportID: julesIOUReportID,
+                participantAccountIDs: [JULES_ACCOUNT_ID],
+            };
+            const julesChatCreatedAction: OnyxEntry<OnyxTypes.ReportAction> = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                created: DateUtils.getDBTime(),
+                reportID: julesChatReport.reportID,
+            };
+            const julesCreatedAction: OnyxEntry<OnyxTypes.ReportAction> = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
+                created: DateUtils.getDBTime(),
+                reportID: julesIOUReportID,
+            };
+            jest.advanceTimersByTime(200);
+            const julesExistingTransaction: OnyxEntry<OnyxTypes.Transaction> = {
+                transactionID: NumberUtils.rand64(),
+                amount: 1000,
+                comment: {
+                    comment: 'This is an existing transaction',
+                },
+                created: DateUtils.getDBTime(),
+                currency: '',
+                merchant: '',
+                reportID: '',
+            };
+            let julesIOUReport: OnyxEntry<OnyxTypes.Report> = {
+                reportID: julesIOUReportID,
+                chatReportID: julesChatReport.reportID,
+                type: CONST.REPORT.TYPE.IOU,
+                ownerAccountID: RORY_ACCOUNT_ID,
+                managerID: JULES_ACCOUNT_ID,
+                currency: CONST.CURRENCY.USD,
+                total: julesExistingTransaction?.amount,
+            };
+            const julesExistingIOUAction: OnyxEntry<OnyxTypes.ReportAction> = {
+                reportActionID: NumberUtils.rand64(),
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                actorAccountID: RORY_ACCOUNT_ID,
+                created: DateUtils.getDBTime(),
+                originalMessage: {
+                    IOUReportID: julesIOUReportID,
+                    IOUTransactionID: julesExistingTransaction?.transactionID,
+                    amount: julesExistingTransaction?.amount ?? 0,
+                    currency: CONST.CURRENCY.USD,
+                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                    participantAccountIDs: [RORY_ACCOUNT_ID, JULES_ACCOUNT_ID],
+                },
+                reportID: julesIOUReportID,
+            };
+
+            let carlosIOUReport: OnyxEntry<OnyxTypes.Report>;
+            let carlosIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let carlosIOUCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let carlosTransaction: OnyxEntry<OnyxTypes.Transaction>;
+
+            let julesIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let julesIOUCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let julesTransaction: OnyxEntry<OnyxTypes.Transaction>;
+
+            let vitChatReport: OnyxEntry<OnyxTypes.Report>;
+            let vitIOUReport: OnyxEntry<OnyxTypes.Report>;
+            let vitCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let vitIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let vitTransaction: OnyxEntry<OnyxTypes.Transaction>;
+
+            let groupChat: OnyxEntry<OnyxTypes.Report>;
+            let groupCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let groupIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let groupTransaction: OnyxEntry<OnyxTypes.Transaction>;
+
+            const reportCollectionDataSet = toCollectionDataSet(ONYXKEYS.COLLECTION.REPORT, [carlosChatReport, julesChatReport, julesIOUReport], (item) => item.reportID);
+
+            const carlosActionsCollectionDataSet = toCollectionDataSet(
+                `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}`,
+                [
+                    {
+                        [carlosCreatedAction.reportActionID]: carlosCreatedAction,
+                    },
+                ],
+                (item) => item[carlosCreatedAction.reportActionID].reportID ?? '',
+            );
+
+            const julesActionsCollectionDataSet = toCollectionDataSet(
+                `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}`,
+                [
+                    {
+                        [julesCreatedAction.reportActionID]: julesCreatedAction,
+                        [julesExistingIOUAction.reportActionID]: julesExistingIOUAction,
+                    },
+                ],
+                (item) => item[julesCreatedAction.reportActionID].reportID ?? '',
+            );
+
+            const julesCreatedActionsCollectionDataSet = toCollectionDataSet(
+                `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}`,
+                [
+                    {
+                        [julesChatCreatedAction.reportActionID]: julesChatCreatedAction,
+                    },
+                ],
+                (item) => item[julesChatCreatedAction.reportActionID].reportID ?? '',
+            );
+
+            return (
+                Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {
+                    ...reportCollectionDataSet,
+                })
+                    .then(() =>
+                        Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
+                            ...carlosActionsCollectionDataSet,
+                            ...julesCreatedActionsCollectionDataSet,
+                            ...julesActionsCollectionDataSet,
+                        }),
+                    )
+                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`, julesExistingTransaction))
+                    .then(() => {
+                        // When we split a bill offline
+                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                        fetch.pause();
+                        IOU.splitBill(
+                            // TODO: Migrate after the backend accepts accountIDs
+                            [
+                                [CARLOS_EMAIL, String(CARLOS_ACCOUNT_ID)],
+                                [JULES_EMAIL, String(JULES_ACCOUNT_ID)],
+                                [VIT_EMAIL, String(VIT_ACCOUNT_ID)],
+                            ].map(([email, accountID]) => ({login: email, accountID: Number(accountID)})),
+                            RORY_EMAIL,
+                            RORY_ACCOUNT_ID,
+                            amount,
+                            comment,
+                            CONST.CURRENCY.USD,
+                            merchant,
+                            '',
+                            '',
+                            '',
+                        );
+                        return waitForBatchedUpdates();
+                    })
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should now be 10 reports
+                                        expect(Object.values(allReports ?? {}).length).toBe(10);
+
+                                        // 1. The chat report with Rory + Carlos
+                                        carlosChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === carlosChatReport?.reportID) ?? null;
+                                        expect(isEmptyObject(carlosChatReport)).toBe(false);
+                                        expect(carlosChatReport?.pendingFields).toBeFalsy();
+
+                                        // 2. The IOU report with Rory + Carlos (new)
+                                        carlosIOUReport =
+                                            Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === CARLOS_ACCOUNT_ID) ?? null;
+                                        expect(isEmptyObject(carlosIOUReport)).toBe(false);
+                                        expect(carlosIOUReport?.total).toBe(amount / 4);
+
+                                        // 3. The chat report with Rory + Jules
+                                        julesChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesChatReport?.reportID) ?? null;
+                                        expect(isEmptyObject(julesChatReport)).toBe(false);
+                                        expect(julesChatReport?.pendingFields).toBeFalsy();
+
+                                        // 4. The IOU report with Rory + Jules
+                                        julesIOUReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesIOUReport?.reportID) ?? null;
+                                        expect(isEmptyObject(julesIOUReport)).toBe(false);
+                                        expect(julesChatReport?.pendingFields).toBeFalsy();
+                                        expect(julesIOUReport?.total).toBe((julesExistingTransaction?.amount ?? 0) + amount / 4);
+
+                                        // 5. The chat report with Rory + Vit (new)
+                                        vitChatReport =
+                                            Object.values(allReports ?? {}).find(
+                                                (report) => report?.type === CONST.REPORT.TYPE.CHAT && isEqual(report.participantAccountIDs, [VIT_ACCOUNT_ID]),
+                                            ) ?? null;
+                                        expect(isEmptyObject(vitChatReport)).toBe(false);
+                                        expect(vitChatReport?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
+
+                                        // 6. The IOU report with Rory + Vit (new)
+                                        vitIOUReport =
+                                            Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === VIT_ACCOUNT_ID) ?? null;
+                                        expect(isEmptyObject(vitIOUReport)).toBe(false);
+                                        expect(vitIOUReport?.total).toBe(amount / 4);
+
+                                        // 7. The group chat with everyone
+                                        groupChat =
+                                            Object.values(allReports ?? {}).find(
+                                                (report) =>
+                                                    report?.type === CONST.REPORT.TYPE.CHAT && isEqual(report.participantAccountIDs, [CARLOS_ACCOUNT_ID, JULES_ACCOUNT_ID, VIT_ACCOUNT_ID]),
+                                            ) ?? null;
+                                        expect(isEmptyObject(groupChat)).toBe(false);
+                                        expect(groupChat?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
+
+                                        // The 1:1 chat reports and the IOU reports should be linked together
+                                        expect(carlosChatReport?.iouReportID).toBe(carlosIOUReport?.reportID);
+                                        expect(carlosIOUReport?.chatReportID).toBe(carlosChatReport?.reportID);
+                                        expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+                                        expect(julesChatReport?.iouReportID).toBe(julesIOUReport?.reportID);
+                                        expect(julesIOUReport?.chatReportID).toBe(julesChatReport?.reportID);
+
+                                        expect(vitChatReport?.iouReportID).toBe(vitIOUReport?.reportID);
+                                        expect(vitIOUReport?.chatReportID).toBe(vitChatReport?.reportID);
+                                        expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        // There should be reportActions on all 7 chat reports + 3 IOU reports in each 1:1 chat
+                                        expect(Object.values(allReportActions ?? {}).length).toBe(10);
+
+                                        const carlosReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${carlosChatReport?.iouReportID}`];
+                                        const julesReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesChatReport?.iouReportID}`];
+                                        const vitReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${vitChatReport?.iouReportID}`];
+                                        const groupReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChat?.reportID}`];
+
+                                        // Carlos DM should have two reportActions – the existing CREATED action and a pending IOU action
+                                        expect(Object.values(carlosReportActions ?? {}).length).toBe(2);
+                                        carlosIOUCreatedAction =
+                                            Object.values(carlosReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                            ) ?? null;
+                                        carlosIOUAction =
+                                            Object.values(carlosReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                            ) ?? null;
+                                        expect(carlosIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(carlosIOUAction?.originalMessage.IOUReportID).toBe(carlosIOUReport?.reportID);
+                                        expect(carlosIOUAction?.originalMessage.amount).toBe(amount / 4);
+                                        expect(carlosIOUAction?.originalMessage.comment).toBe(comment);
+                                        expect(carlosIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                        expect(Date.parse(carlosIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(carlosIOUAction?.created ?? ''));
+
+                                        // Jules DM should have three reportActions, the existing CREATED action, the existing IOU action, and a new pending IOU action
+                                        expect(Object.values(julesReportActions ?? {}).length).toBe(3);
+                                        expect(julesReportActions?.[julesCreatedAction.reportActionID]).toStrictEqual(julesCreatedAction);
+                                        julesIOUCreatedAction =
+                                            Object.values(julesReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                            ) ?? null;
+                                        julesIOUAction =
+                                            Object.values(julesReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU =>
+                                                    reportAction.reportActionID !== julesCreatedAction.reportActionID &&
+                                                    reportAction.reportActionID !== julesExistingIOUAction.reportActionID,
+                                            ) ?? null;
+                                        expect(julesIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(julesIOUAction?.originalMessage.IOUReportID).toBe(julesIOUReport?.reportID);
+                                        expect(julesIOUAction?.originalMessage.amount).toBe(amount / 4);
+                                        expect(julesIOUAction?.originalMessage.comment).toBe(comment);
+                                        expect(julesIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                        expect(Date.parse(julesIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(julesIOUAction?.created ?? ''));
+
+                                        // Vit DM should have two reportActions – a pending CREATED action and a pending IOU action
+                                        expect(Object.values(vitReportActions ?? {}).length).toBe(2);
+                                        vitCreatedAction =
+                                            Object.values(vitReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                            ) ?? null;
+                                        vitIOUAction =
+                                            Object.values(vitReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                            ) ?? null;
+                                        expect(vitCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(vitIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(vitIOUAction?.originalMessage.IOUReportID).toBe(vitIOUReport?.reportID);
+                                        expect(vitIOUAction?.originalMessage.amount).toBe(amount / 4);
+                                        expect(vitIOUAction?.originalMessage.comment).toBe(comment);
+                                        expect(vitIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                        expect(Date.parse(vitCreatedAction?.created ?? '')).toBeLessThan(Date.parse(vitIOUAction?.created ?? ''));
+
+                                        // Group chat should have two reportActions – a pending CREATED action and a pending IOU action w/ type SPLIT
+                                        expect(Object.values(groupReportActions ?? {}).length).toBe(2);
+                                        groupCreatedAction =
+                                            Object.values(groupReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
+                                        groupIOUAction =
+                                            Object.values(groupReportActions ?? {}).find(
+                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                            ) ?? null;
+                                        expect(groupCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(groupIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(groupIOUAction?.originalMessage).not.toHaveProperty('IOUReportID');
+                                        expect(groupIOUAction?.originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.SPLIT);
+                                        expect(Date.parse(groupCreatedAction?.created ?? '')).toBeLessThanOrEqual(Date.parse(groupIOUAction?.created ?? ''));
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        /* There should be 5 transactions
+                                         *   – one existing one with Jules
+                                         *   - one for each of the three IOU reports
+                                         *   - one on the group chat w/ deleted report
+                                         */
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(5);
+                                        expect(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`]).toBeTruthy();
+
+                                        carlosTransaction =
+                                            Object.values(allTransactions ?? {}).find(
+                                                (transaction) => transaction?.transactionID === (carlosIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                                            ) ?? null;
+                                        julesTransaction =
+                                            Object.values(allTransactions ?? {}).find(
+                                                (transaction) => transaction?.transactionID === (julesIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                                            ) ?? null;
+                                        vitTransaction =
+                                            Object.values(allTransactions ?? {}).find(
+                                                (transaction) => transaction?.transactionID === (vitIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                                            ) ?? null;
+                                        groupTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.reportID === CONST.REPORT.SPLIT_REPORTID) ?? null;
+
+                                        expect(carlosTransaction?.reportID).toBe(carlosIOUReport?.reportID);
+                                        expect(julesTransaction?.reportID).toBe(julesIOUReport?.reportID);
+                                        expect(vitTransaction?.reportID).toBe(vitIOUReport?.reportID);
+                                        expect(groupTransaction).toBeTruthy();
+
+                                        expect(carlosTransaction?.amount).toBe(amount / 4);
+                                        expect(julesTransaction?.amount).toBe(amount / 4);
+                                        expect(vitTransaction?.amount).toBe(amount / 4);
+                                        expect(groupTransaction?.amount).toBe(amount);
+
+                                        expect(carlosTransaction?.comment.comment).toBe(comment);
+                                        expect(julesTransaction?.comment.comment).toBe(comment);
+                                        expect(vitTransaction?.comment.comment).toBe(comment);
+                                        expect(groupTransaction?.comment.comment).toBe(comment);
+
+                                        expect(carlosTransaction?.merchant).toBe(merchant);
+                                        expect(julesTransaction?.merchant).toBe(merchant);
+                                        expect(vitTransaction?.merchant).toBe(merchant);
+                                        expect(groupTransaction?.merchant).toBe(merchant);
+
+                                        expect(carlosTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
+                                        expect(julesTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
+                                        expect(vitTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
+
+                                        expect(carlosTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
+                                        expect(julesTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
+                                        expect(vitTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
+
+                                        expect(carlosTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(julesTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(vitTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(groupTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+                                    waitForCollectionCallback: false,
+                                    callback: (allPersonalDetails) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(allPersonalDetails).toMatchObject({
+                                            [VIT_ACCOUNT_ID]: {
+                                                accountID: VIT_ACCOUNT_ID,
+                                                displayName: VIT_EMAIL,
+                                                login: VIT_EMAIL,
+                                            },
+                                        });
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.resume)
+                    .then(waitForNetworkPromises)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allReports ?? {}).forEach((report) => {
+                                            if (!report?.pendingFields) {
+                                                return;
+                                            }
+                                            Object.values(report?.pendingFields).forEach((pendingField) => expect(pendingField).toBeFalsy());
+                                        });
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allReportActions ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+                                        Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+            );
+        });
+    });
+
+    describe('payMoneyRequestElsewhere', () => {
+        it('clears outstanding IOUReport', () => {
+            const amount = 10000;
+            const comment = 'Giv money plz';
+            let chatReport: OnyxEntry<OnyxTypes.Report>;
+            let iouReport: OnyxEntry<OnyxTypes.Report>;
+            let createIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let payIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let transaction: OnyxEntry<OnyxTypes.Transaction>;
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+            return (
+                waitForBatchedUpdates()
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+
+                                        const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                        chatReport = chatReports[0];
+                                        expect(chatReport).toBeTruthy();
+                                        expect(chatReport).toHaveProperty('reportID');
+                                        expect(chatReport).toHaveProperty('iouReportID');
+
+                                        iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                        expect(iouReport).toBeTruthy();
+                                        expect(iouReport).toHaveProperty('reportID');
+                                        expect(iouReport).toHaveProperty('chatReportID');
+
+                                        expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+                                        expect(iouReport?.chatReportID).toBe(chatReport?.reportID);
+
+                                        expect(chatReport?.pendingFields).toBeFalsy();
+                                        expect(iouReport?.pendingFields).toBeFalsy();
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+
+                                        createIOUAction =
+                                            Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        expect(createIOUAction).toBeTruthy();
+                                        expect((createIOUAction?.originalMessage as IOUMessage)?.IOUReportID).toBe(iouReport?.reportID);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                    waitForCollectionCallback: true,
+                                    callback: (allTransactions) => {
+                                        Onyx.disconnect(connectionID);
+                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                        transaction = Object.values(allTransactions ?? {}).find((t) => t) ?? null;
+                                        expect(transaction).toBeTruthy();
+                                        expect(transaction?.amount).toBe(amount);
+                                        expect(transaction?.reportID).toBe(iouReport?.reportID);
+                                        expect((createIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transaction?.transactionID);
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(() => {
+                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                        fetch.pause();
+                        if (chatReport && iouReport) {
+                            IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, chatReport, iouReport);
+                        }
+                        return waitForBatchedUpdates();
+                    })
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+
+                                        chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT) ?? null;
+                                        iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                        expect(chatReport?.iouReportID).toBeFalsy();
+
+                                        // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
+                                        // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+
+                                        payIOUAction =
+                                            Object.values(reportActionsForIOUReport ?? {}).find(
+                                                (reportAction) =>
+                                                    reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction?.originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                                            ) ?? null;
+                                        expect(payIOUAction).toBeTruthy();
+                                        expect(payIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    .then(fetch.resume)
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReports) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+
+                                        chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT) ?? null;
+                                        iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                        expect(chatReport?.iouReportID).toBeFalsy();
+
+                                        // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
+                                        // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+                    .then(
+                        () =>
+                            new Promise<void>((resolve) => {
+                                const connectionID = Onyx.connect({
+                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                    waitForCollectionCallback: true,
+                                    callback: (allReportActions) => {
+                                        Onyx.disconnect(connectionID);
+
+                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
+                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+
+                                        payIOUAction =
+                                            Object.values(reportActionsForIOUReport ?? {}).find(
+                                                (reportAction) =>
+                                                    reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                                            ) ?? null;
+                                        expect(payIOUAction).toBeTruthy();
+                                        expect(payIOUAction?.pendingAction).toBeFalsy();
+
+                                        resolve();
+                                    },
+                                });
+                            }),
+                    )
+            );
+        });
+    });
+
+    describe('edit money request', () => {
+        const amount = 10000;
+        const comment = '💸💸💸💸';
+        const merchant = 'NASDAQ';
+
+        afterEach(() => {
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+        });
+
+        it('updates the IOU request and IOU report when offline', () => {
+            let thread: OptimisticChatReport;
+            let iouReport: OnyxEntry<OnyxTypes.Report> = null;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction> = null;
+            let transaction: OnyxEntry<OnyxTypes.Transaction> = null;
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+            return waitForBatchedUpdates()
+                .then(() => {
+                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t)) ?? null;
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport) ?? null;
+                    Onyx.set(`report_${thread?.reportID ?? ''}`, thread);
+                    return waitForBatchedUpdates();
+                })
+                .then(() => {
+                    if (transaction) {
+                        IOU.editMoneyRequest(
+                            transaction,
+                            thread.reportID,
+                            {amount: 20000, comment: 'Double the amount!'},
+                            {
+                                id: '123',
+                                role: 'user',
+                                type: 'free',
+                                name: '',
+                                owner: '',
+                                outputCurrency: '',
+                                isPolicyExpenseChatEnabled: false,
+                            },
+                            {},
+                            {},
+                        );
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
+                                    expect(updatedTransaction?.modifiedAmount).toBe(20000);
+                                    expect(updatedTransaction?.comment).toMatchObject({comment: 'Double the amount!'});
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (allActions) => {
+                                    Onyx.disconnect(connectionID);
+                                    const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
+                                    expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
+                                    expect(updatedAction?.originalMessage).toEqual(
+                                        expect.objectContaining({amount: 20000, newComment: 'Double the amount!', oldAmount: amount, oldComment: comment}),
+                                    );
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
+                                    expect(updatedIOUReport).toEqual(
+                                        expect.objectContaining({
+                                            total: 20000,
+                                            cachedTotal: '$200.00',
+                                            lastMessageHtml: 'requested $200.00',
+                                            lastMessageText: 'requested $200.00',
+                                        }),
+                                    );
+                                    expect(updatedChatReport).toEqual(
+                                        expect.objectContaining({
+                                            lastMessageHtml: `${CARLOS_EMAIL} owes $200.00`,
+                                            lastMessageText: `${CARLOS_EMAIL} owes $200.00`,
+                                        }),
+                                    );
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    fetch.resume();
+                });
+        });
+
+        it('resets the IOU request and IOU report when api returns an error', () => {
+            let thread: OptimisticChatReport;
+            let iouReport: OnyxEntry<OnyxTypes.Report>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let transaction: OnyxEntry<OnyxTypes.Transaction>;
+
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+            return waitForBatchedUpdates()
+                .then(() => {
+                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    [iouReport] = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t)) ?? null;
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport);
+                    Onyx.set(`report_${thread.reportID}`, thread);
+                    return waitForBatchedUpdates();
+                })
+                .then(() => {
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    fetch.fail();
+
+                    if (transaction) {
+                        IOU.editMoneyRequest(
+                            transaction,
+                            thread.reportID,
+                            {amount: 20000, comment: 'Double the amount!'},
+                            {
+                                id: '123',
+                                role: 'user',
+                                type: 'free',
+                                name: '',
+                                owner: '',
+                                outputCurrency: '',
+                                isPolicyExpenseChatEnabled: false,
+                            },
+                            {},
+                            {},
+                        );
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connectionID);
+
+                                    const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
+                                    expect(updatedTransaction?.modifiedAmount).toBe(undefined);
+                                    expect(updatedTransaction?.amount).toBe(10000);
+                                    expect(updatedTransaction?.comment).toMatchObject({comment});
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (allActions) => {
+                                    Onyx.disconnect(connectionID);
+                                    const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
+                                    expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
+                                    expect(Object.values(updatedAction?.errors ?? {})).toEqual(expect.arrayContaining([['iou.error.genericEditFailureMessage', {isTranslated: false}]]));
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
+                                    expect(updatedIOUReport).toEqual(
+                                        expect.objectContaining({
+                                            total: 10000,
+                                            cachedTotal: '$100.00',
+                                            lastMessageHtml: `requested $${amount / 100}.00 for ${comment}`,
+                                            lastMessageText: `requested $${amount / 100}.00 for ${comment}`,
+                                        }),
+                                    );
+                                    expect(updatedChatReport).toEqual(
+                                        expect.objectContaining({
+                                            lastMessageHtml: '',
+                                        }),
+                                    );
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+
+    describe('pay expense report via ACH', () => {
+        const amount = 10000;
+        const comment = '💸💸💸💸';
+        const merchant = 'NASDAQ';
+
+        afterEach(() => {
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+        });
+
+        it('updates the expense request and expense report when paid while offline', () => {
+            let expenseReport: OnyxEntry<OnyxTypes.Report>;
+            let chatReport: OnyxEntry<OnyxTypes.Report>;
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            Onyx.set(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
+            return waitForBatchedUpdates()
+                .then(() => {
+                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (chatReport) {
+                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (chatReport && expenseReport) {
+                        IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.VBBA, chatReport, expenseReport);
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (allActions) => {
+                                    Onyx.disconnect(connectionID);
+                                    expect(Object.values(allActions ?? {})).toEqual(
+                                        expect.arrayContaining([
+                                            expect.objectContaining({
+                                                message: expect.arrayContaining([
+                                                    expect.objectContaining({
+                                                        html: `paid $${amount / 100}.00 with Expensify`,
+                                                        text: `paid $${amount / 100}.00 with Expensify`,
+                                                    }),
+                                                ]),
+                                                originalMessage: expect.objectContaining({
+                                                    amount,
+                                                    paymentType: CONST.IOU.PAYMENT_TYPE.VBBA,
+                                                    type: 'pay',
+                                                }),
+                                            }),
+                                        ]),
+                                    );
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === expenseReport?.chatReportID);
+                                    expect(updatedIOUReport).toEqual(
+                                        expect.objectContaining({
+                                            lastMessageHtml: `paid $${amount / 100}.00 with Expensify`,
+                                            lastMessageText: `paid $${amount / 100}.00 with Expensify`,
+                                            statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
+                                            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+                                        }),
+                                    );
+                                    expect(updatedChatReport).toEqual(
+                                        expect.objectContaining({
+                                            lastMessageHtml: `paid $${amount / 100}.00 with Expensify`,
+                                            lastMessageText: `paid $${amount / 100}.00 with Expensify`,
+                                        }),
+                                    );
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('shows an error when paying results in an error', () => {
+            let expenseReport: OnyxEntry<OnyxTypes.Report>;
+            let chatReport: OnyxEntry<OnyxTypes.Report>;
+
+            Onyx.set(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
+            return waitForBatchedUpdates()
+                .then(() => {
+                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (chatReport) {
+                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    fetch.fail();
+                    if (chatReport && expenseReport) {
+                        IOU.payMoneyRequest('ACH', chatReport, expenseReport);
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (allActions) => {
+                                    Onyx.disconnect(connectionID);
+                                    const erroredAction = Object.values(allActions ?? {}).find((action) => !isEmptyObject(action?.errors));
+                                    expect(Object.values(erroredAction?.errors ?? {})).toEqual(expect.arrayContaining([['iou.error.other', {isTranslated: false}]]));
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+
+    describe('deleteMoneyRequest', () => {
+        const amount = 10000;
+        const comment = 'Send me money please';
+        let chatReport: OnyxEntry<OnyxTypes.Report>;
+        let iouReport: OnyxEntry<OnyxTypes.Report>;
+        let createIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+        let transaction: OnyxEntry<OnyxTypes.Transaction>;
+        let thread: OptimisticChatReport;
+        const TEST_USER_ACCOUNT_ID = 1;
+        const TEST_USER_LOGIN = 'test@test.com';
+        let IOU_REPORT_ID: string;
+        let reportActionID;
+        const REPORT_ACTION: OnyxEntry<OnyxTypes.ReportAction> = {
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+            actorAccountID: TEST_USER_ACCOUNT_ID,
+            automatic: false,
+            avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
+            message: [{type: 'COMMENT', html: 'Testing a comment', text: 'Testing a comment', translationKey: ''}],
+            person: [{type: 'TEXT', style: 'strong', text: 'Test User'}],
+            shouldShow: true,
+            created: DateUtils.getDBTime(),
+            reportActionID: '1',
+            originalMessage: {
+                html: '',
+                whisperedTo: [],
+            },
+        };
+
+        let reportActions: OnyxCollection<OnyxTypes.ReportAction>;
+
+        beforeEach(async () => {
+            // Given mocks are cleared and helpers are set up
+            jest.clearAllMocks();
+            PusherHelper.setup();
+
+            // Given a test user is signed in with Onyx setup and some initial data
+            await TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN);
+            User.subscribeToUserEvents();
+            await waitForBatchedUpdates();
+            await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
+
+            // When an IOU request for money is made
+            IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment, {});
+            await waitForBatchedUpdates();
+
+            // When fetching all reports from Onyx
+            const allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            // Then we should have exactly 3 reports
+            expect(Object.values(allReports ?? {}).length).toBe(3);
+
+            // Then one of them should be a chat report with relevant properties
+            chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? null;
+            expect(chatReport).toBeTruthy();
+            expect(chatReport).toHaveProperty('reportID');
+            expect(chatReport).toHaveProperty('iouReportID');
+
+            // Then one of them should be an IOU report with relevant properties
+            iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Then their IDs should reference each other
+            expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+            expect(iouReport?.chatReportID).toBe(chatReport?.reportID);
+
+            // Storing IOU Report ID for further reference
+            IOU_REPORT_ID = chatReport?.iouReportID ?? '';
+
+            await waitForBatchedUpdates();
+
+            // When fetching all report actions from Onyx
+            const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            // Then we should find an IOU action with specific properties
+            const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+            createIOUAction =
+                Object.values(reportActionsForIOUReport ?? {}).find(
+                    (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                ) ?? null;
+            expect(createIOUAction).toBeTruthy();
+            expect(createIOUAction?.originalMessage.IOUReportID).toBe(iouReport?.reportID);
+
+            // When fetching all transactions from Onyx
+            const allTransactions = await new Promise<OnyxCollection<OnyxTypes.Transaction>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                    waitForCollectionCallback: true,
+                    callback: (transactions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactions);
+                    },
+                });
+            });
+
+            // Then we should find a specific transaction with relevant properties
+            transaction = Object.values(allTransactions ?? {}).find((t) => t) ?? null;
+            expect(transaction).toBeTruthy();
+            expect(transaction?.amount).toBe(amount);
+            expect(transaction?.reportID).toBe(iouReport?.reportID);
+            expect(createIOUAction?.originalMessage.IOUTransactionID).toBe(transaction?.transactionID);
+        });
+
+        afterEach(PusherHelper.teardown);
+
+        it('delete a money request (IOU Action and transaction) successfully', async () => {
+            // Given the fetch operations are paused and a money request is initiated
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+
+            if (transaction && createIOUAction) {
+                // When the money request is deleted
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, true);
+            }
+            await waitForBatchedUpdates();
+
+            // Then we check if the IOU report action is removed from the report actions collection
+            let reportActionsForReport = await new Promise<OnyxCollection<OnyxTypes.ReportAction>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (actionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actionsForReport);
+                    },
+                });
+            });
+
+            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            // Then the IOU Action should be truthy for offline support.
+            expect(createIOUAction).toBeTruthy();
+
+            // Then we check if the transaction is removed from the transactions collection
+            const t = await new Promise<OnyxEntry<OnyxTypes.Transaction>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`,
+                    waitForCollectionCallback: false,
+                    callback: (transactionResult) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactionResult);
+                    },
+                });
+            });
+
+            expect(t).toBeFalsy();
+
+            // Given fetch operations are resumed
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+            await waitForBatchedUpdates();
+
+            // Then we recheck the IOU report action from the report actions collection
+            reportActionsForReport = await new Promise<OnyxCollection<OnyxTypes.ReportAction>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (actionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actionsForReport);
+                    },
+                });
+            });
+
+            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            expect(createIOUAction).toBeFalsy();
+
+            // Then we recheck the transaction from the transactions collection
+            const tr = await new Promise<OnyxEntry<OnyxTypes.Transaction>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`,
+                    waitForCollectionCallback: false,
+                    callback: (transactionResult) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactionResult);
+                    },
+                });
+            });
+
+            expect(tr).toBeFalsy();
+        });
+
+        it('delete the IOU report when there are no visible comments left in the IOU report', async () => {
+            // Given an IOU report and a paused fetch state
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+
+            if (transaction && createIOUAction) {
+                // When the IOU money request is deleted
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, true);
+            }
+            await waitForBatchedUpdates();
+
+            let report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (res) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(res);
+                    },
+                });
+            });
+
+            // Then the report should be truthy for offline support
+            expect(report).toBeTruthy();
+
+            // Given the resumed fetch state
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+            await waitForBatchedUpdates();
+
+            report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (res) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(res);
+                    },
+                });
+            });
+
+            // Then the report should be falsy so that there is no trace of the money request.
+            expect(report).toBeFalsy();
+        });
+
+        it('does not delete the IOU report when there are visible comments left in the IOU report', async () => {
+            // Given the initial setup is completed
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            // When a comment is added to the IOU report
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            // Then verify that the comment is correctly added
+            const resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction?.reportActionID ?? '';
+
+            expect(resultAction?.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction?.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction?.pendingAction).toBeUndefined();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(Object.values(reportActions ?? {}).length).toBe(3);
+
+            // Then check the loading state of our action
+            const resultActionAfterUpdate = reportActions?.[reportActionID];
+            expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
+
+            // When we attempt to delete a money request from the IOU report
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            if (transaction && createIOUAction) {
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then expect that the IOU report still exists
+            let allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            await waitForBatchedUpdates();
+
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Given the resumed fetch state
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+
+            allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+            // Then expect that the IOU report still exists
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+        });
+
+        it('delete the transaction thread if there are no visible comments in the thread', async () => {
+            // Given all promises are resolved
+            await waitForBatchedUpdates();
+            jest.advanceTimersByTime(10);
+
+            // Given a transaction thread
+            thread = ReportUtils.buildTransactionThread(createIOUAction, iouReport);
+
+            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            // Given User logins from the participant accounts
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+
+            // When Opening a thread report with the given details
+            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
+            await waitForBatchedUpdates();
+
+            // Then The iou action has the transaction report id as a child report ID
+            const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+            const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            expect(createIOUAction?.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // Given Fetch is paused and timers have advanced
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            jest.advanceTimersByTime(10);
+
+            if (transaction && createIOUAction) {
+                // When Deleting a money request
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then The report for the given thread ID does not exist
+            let report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportData) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reportData);
+                    },
+                });
+            });
+
+            expect(report).toBeFalsy();
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+
+            // Then After resuming fetch, the report for the given thread ID still does not exist
+            report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportData) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reportData);
+                    },
+                });
+            });
+
+            expect(report).toBeFalsy();
+        });
+
+        it('delete the transaction thread if there are only changelogs (i.e. MODIFIEDEXPENSE actions) in the thread', async () => {
+            // Given all promises are resolved
+            await waitForBatchedUpdates();
+            jest.advanceTimersByTime(10);
+
+            // Given a transaction thread
+            thread = ReportUtils.buildTransactionThread(createIOUAction, iouReport);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            // Given User logins from the participant accounts
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+
+            // When Opening a thread report with the given details
+            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
+            await waitForBatchedUpdates();
+
+            // Then The iou action has the transaction report id as a child report ID
+            const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+            const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            expect(createIOUAction?.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+            if (transaction && createIOUAction) {
+                IOU.editMoneyRequest(
+                    transaction,
+                    thread.reportID,
+                    {amount: 20000, comment: 'Double the amount!'},
+                    {
+                        id: '123',
+                        role: 'user',
+                        type: 'free',
+                        name: '',
+                        owner: '',
+                        outputCurrency: '',
+                        isPolicyExpenseChatEnabled: false,
+                    },
+                    {},
+                    {},
+                );
+            }
+            await waitForBatchedUpdates();
+
+            // Verify there are two actions (created + changelog)
+            expect(Object.values(reportActions ?? {}).length).toBe(2);
+
+            // Fetch the updated IOU Action from Onyx
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        resolve();
+                    },
+                });
+            });
+
+            if (transaction && createIOUAction) {
+                // When Deleting a money request
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then, the report for the given thread ID does not exist
+            const report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportData) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reportData);
+                    },
+                });
+            });
+
+            expect(report).toBeFalsy();
+        });
+
+        it('does not delete the transaction thread if there are visible comments in the thread', async () => {
+            // Given initial environment is set up
+            await waitForBatchedUpdates();
+
+            // Given a transaction thread
+            thread = ReportUtils.buildTransactionThread(createIOUAction, iouReport);
+
+            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            jest.advanceTimersByTime(10);
+            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            jest.advanceTimersByTime(10);
+
+            // When a comment is added
+            Report.addComment(thread.reportID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            // Then comment details should match the expected report action
+            const resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction?.reportActionID ?? '';
+            expect(resultAction?.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction?.person).toEqual(REPORT_ACTION.person);
+
+            await waitForBatchedUpdates();
+
+            // Then the report should have 2 actions
+            expect(Object.values(reportActions ?? {}).length).toBe(2);
+            const resultActionAfter = reportActions?.[reportActionID];
+            expect(resultActionAfter?.pendingAction).toBeUndefined();
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+
+            if (transaction && createIOUAction) {
+                // When deleting money request
+                IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then the transaction thread report should still exist
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            // When fetch resumes
+            // Then the transaction thread report should still exist
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+        });
+
+        it('update the moneyRequestPreview to show [Deleted request] when appropriate', async () => {
+            await waitForBatchedUpdates();
+
+            // Given a thread report
+
+            jest.advanceTimersByTime(10);
+            thread = ReportUtils.buildTransactionThread(createIOUAction, iouReport);
+
+            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
+
+            await waitForBatchedUpdates();
+
+            const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            expect(createIOUAction?.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the thread report
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(thread.reportID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            // Fetch the updated IOU Action from Onyx due to addition of comment to transaction thread.
+            // This needs to be fetched as `deleteMoneyRequest` depends on `childVisibleActionCount` in `createIOUAction`.
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        resolve();
+                    },
+                });
+            });
+
+            let resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction?.reportActionID ?? '';
+
+            expect(resultAction?.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction?.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction?.pendingAction).toBeUndefined();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + addcomment) and our optimistic comment has been removed
+            expect(Object.values(reportActions ?? {}).length).toBe(2);
+
+            let resultActionAfterUpdate = reportActions?.[reportActionID];
+
+            // Verify that our action is no longer in the loading state
+            expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
+
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the IOU report
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction?.reportActionID ?? '';
+
+            expect(resultAction?.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction?.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction?.pendingAction).toBeUndefined();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(Object.values(reportActions ?? {}).length).toBe(3);
+
+            resultActionAfterUpdate = reportActions?.[reportActionID];
+
+            // Verify that our action is no longer in the loading state
+            expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            if (transaction && createIOUAction) {
+                // When we delete the money request
+                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then we expect the moneyRequestPreview to show [Deleted request]
+
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        expect(createIOUAction?.message?.[0].isDeletedParentAction).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            // When we resume fetch
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+
+            // Then we expect the moneyRequestPreview to show [Deleted request]
+
+            await new Promise<void>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        expect(createIOUAction?.message?.[0].isDeletedParentAction).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+        });
+
+        it('update IOU report and reportPreview with new totals and messages if the IOU report is not deleted', async () => {
+            await waitForBatchedUpdates();
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+                callback: (val) => (iouReport = val),
+            });
+            await waitForBatchedUpdates();
+
+            // Given a second money request in addition to the first one
+
+            jest.advanceTimersByTime(10);
+            const amount2 = 20000;
+            const comment2 = 'Send me money please 2';
+            if (chatReport) {
+                IOU.requestMoney(chatReport, amount2, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment2, {});
+            }
+
+            await waitForBatchedUpdates();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport?.total).toBe(30000);
+
+            const ioupreview = ReportActionsUtils.getReportPreviewAction(chatReport?.reportID ?? '', iouReport?.reportID ?? '');
+            expect(ioupreview).toBeTruthy();
+            expect(ioupreview?.message?.[0].text).toBe('rory@expensifail.com owes $300.00');
+
+            // When we delete the first money request
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+            jest.advanceTimersByTime(10);
+            if (transaction && createIOUAction) {
+                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            }
+            await waitForBatchedUpdates();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport?.total).toBe(20000);
+
+            // When we resume
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport?.total).toBe(20000);
+        });
+
+        it('navigate the user correctly to the iou Report when appropriate', async () => {
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the iou report
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            const resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction?.reportActionID;
+
+            expect(resultAction?.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction?.person).toEqual(REPORT_ACTION.person);
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(Object.values(reportActions ?? {}).length).toBe(3);
+
+            await waitForBatchedUpdates();
+
+            // Given a thread report
+
+            jest.advanceTimersByTime(10);
+            thread = ReportUtils.buildTransactionThread(createIOUAction, iouReport);
+
+            expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
+            await waitForBatchedUpdates();
+
+            const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            expect(createIOUAction?.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // When we delete the money request in SingleTransactionView and we should not delete the IOU report
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.pause();
+
+            if (transaction && createIOUAction) {
+                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
+            }
+            await waitForBatchedUpdates();
+
+            let allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            await waitForBatchedUpdates();
+
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+            fetch.resume();
+
+            allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Then we expect to navigate to the iou report
+
+            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(IOU_REPORT_ID));
+        });
+
+        it('navigate the user correctly to the chat Report when appropriate', () => {
+            if (transaction && createIOUAction) {
+                // When we delete the money request and we should delete the IOU report
+                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            }
+            // Then we expect to navigate to the chat report
+            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(chatReport?.reportID ?? ''));
+        });
+    });
+
+    describe('submitReport', () => {
+        it('correctly submits a report', () => {
+            const amount = 10000;
+            const comment = '💸💸💸💸';
+            const merchant = 'NASDAQ';
+            let expenseReport: OnyxEntry<OnyxTypes.Report>;
+            let chatReport: OnyxEntry<OnyxTypes.Report>;
+            return waitForBatchedUpdates()
+                .then(() => {
+                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (chatReport) {
+                        IOU.requestMoney(
+                            chatReport,
+                            amount,
+                            CONST.CURRENCY.USD,
+                            '',
+                            merchant,
+                            RORY_EMAIL,
+                            RORY_ACCOUNT_ID,
+                            {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID, isPolicyExpenseChat: true, reportID: chatReport.reportID},
+                            comment,
+                            {},
+                        );
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.merge(`report_${expenseReport?.reportID}`, {
+                                        statusNum: 0,
+                                        stateNum: 0,
+                                    });
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+
+                                    // Verify report is a draft
+                                    expect(expenseReport?.stateNum).toBe(0);
+                                    expect(expenseReport?.statusNum).toBe(0);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (expenseReport) {
+                        IOU.submitReport(expenseReport);
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+
+                                    // Report was submitted correctly
+                                    expect(expenseReport?.stateNum).toBe(1);
+                                    expect(expenseReport?.statusNum).toBe(1);
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+        it('correctly implements error handling', () => {
+            const amount = 10000;
+            const comment = '💸💸💸💸';
+            const merchant = 'NASDAQ';
+            let expenseReport: OnyxEntry<OnyxTypes.Report>;
+            let chatReport: OnyxEntry<OnyxTypes.Report>;
+            return waitForBatchedUpdates()
+                .then(() => {
+                    PolicyActions.createWorkspace(CARLOS_EMAIL, true, "Carlos's Workspace");
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    if (chatReport) {
+                        IOU.requestMoney(
+                            chatReport,
+                            amount,
+                            CONST.CURRENCY.USD,
+                            '',
+                            merchant,
+                            RORY_EMAIL,
+                            RORY_ACCOUNT_ID,
+                            {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID, isPolicyExpenseChat: true, reportID: chatReport.reportID},
+                            comment,
+                            {},
+                        );
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.merge(`report_${expenseReport?.reportID}`, {
+                                        statusNum: 0,
+                                        stateNum: 0,
+                                    });
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+
+                                    // Verify report is a draft
+                                    expect(expenseReport?.stateNum).toBe(0);
+                                    expect(expenseReport?.statusNum).toBe(0);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
+                    fetch.fail();
+                    if (expenseReport) {
+                        IOU.submitReport(expenseReport);
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connectionID = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connectionID);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+
+                                    // Report was submitted with some fail
+                                    expect(expenseReport?.stateNum).toBe(0);
+                                    expect(expenseReport?.statusNum).toBe(0);
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+});
diff --git a/tests/unit/GithubUtilsTest.ts b/tests/unit/GithubUtilsTest.ts
index 794139286527..8267b26d3d0f 100644
--- a/tests/unit/GithubUtilsTest.ts
+++ b/tests/unit/GithubUtilsTest.ts
@@ -355,7 +355,7 @@ describe('GithubUtils', () => {
             },
             {
                 number: 6,
-                title: '[Internal QA] Test Internal QA PR',
+                title: '[Internal QA] Another Test Internal QA PR',
                 html_url: 'https://github.com/Expensify/App/pull/6',
                 user: {login: 'testUser'},
                 labels: [
@@ -368,14 +368,7 @@ describe('GithubUtils', () => {
                         color: 'f29513',
                     },
                 ],
-                assignees: [
-                    {
-                        login: 'octocat',
-                    },
-                    {
-                        login: 'hubot',
-                    },
-                ],
+                assignees: [],
             },
             {
                 number: 7,
@@ -392,16 +385,12 @@ describe('GithubUtils', () => {
                         color: 'f29513',
                     },
                 ],
-                assignees: [
-                    {
-                        login: 'octocat',
-                    },
-                    {
-                        login: 'hubot',
-                    },
-                ],
+                assignees: [],
             },
         ];
+        const mockInternalQaPR = {
+            merged_by: {login: 'octocat'},
+        };
         const mockGithub = jest.fn(() => ({
             getOctokit: () => ({
                 rest: {
@@ -410,6 +399,7 @@ describe('GithubUtils', () => {
                     },
                     pulls: {
                         list: jest.fn().mockResolvedValue({data: mockPRs}),
+                        get: jest.fn().mockResolvedValue({data: mockInternalQaPR}),
                     },
                 },
                 paginate: jest.fn().mockImplementation(<T>(objectMethod: () => Promise<ObjectMethodData<T>>) => objectMethod().then(({data}) => data)),
@@ -446,7 +436,7 @@ describe('GithubUtils', () => {
         const internalQAHeader = '\r\n\r\n**Internal QA:**';
         const lineBreak = '\r\n';
         const lineBreakDouble = '\r\n\r\n';
-        const assignOctocatHubot = ' - @octocat @hubot';
+        const assignOctocat = ' - @octocat';
         const deployerVerificationsHeader = '\r\n**Deployer verifications:**';
         // eslint-disable-next-line max-len
         const timingDashboardVerification =
@@ -468,8 +458,8 @@ describe('GithubUtils', () => {
             `${lineBreak}`;
 
         test('Test no verified PRs', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${baseExpectedOutput}` +
                         `${openCheckbox}${basePRList[2]}` +
                         `${lineBreak}${openCheckbox}${basePRList[0]}` +
@@ -482,12 +472,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test some verified PRs', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList, [basePRList[0]]).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList, [basePRList[0]]).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${baseExpectedOutput}` +
                         `${openCheckbox}${basePRList[2]}` +
                         `${lineBreak}${closedCheckbox}${basePRList[0]}` +
@@ -500,12 +491,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test all verified PRs', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList, basePRList).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList, basePRList).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${allVerifiedExpectedOutput}` +
                         `${lineBreak}${deployerVerificationsHeader}` +
                         `${lineBreak}${openCheckbox}${timingDashboardVerification}` +
@@ -513,12 +505,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test no resolved deploy blockers', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList, basePRList, baseDeployBlockerList).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList, basePRList, baseDeployBlockerList).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${allVerifiedExpectedOutput}` +
                         `${lineBreak}${deployBlockerHeader}` +
                         `${lineBreak}${openCheckbox}${baseDeployBlockerList[0]}` +
@@ -529,12 +522,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}${lineBreak}` +
                         `${lineBreak}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test some resolved deploy blockers', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList, basePRList, baseDeployBlockerList, [baseDeployBlockerList[0]]).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList, basePRList, baseDeployBlockerList, [baseDeployBlockerList[0]]).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${allVerifiedExpectedOutput}` +
                         `${lineBreak}${deployBlockerHeader}` +
                         `${lineBreak}${closedCheckbox}${baseDeployBlockerList[0]}` +
@@ -545,12 +539,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test all resolved deploy blockers', () => {
-            githubUtils.generateStagingDeployCashBody(tag, basePRList, basePRList, baseDeployBlockerList, baseDeployBlockerList).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, basePRList, basePRList, baseDeployBlockerList, baseDeployBlockerList).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${baseExpectedOutput}` +
                         `${closedCheckbox}${basePRList[2]}` +
                         `${lineBreak}${closedCheckbox}${basePRList[0]}` +
@@ -566,12 +561,13 @@ describe('GithubUtils', () => {
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual([]);
             });
         });
 
         test('Test internalQA PRs', () => {
-            githubUtils.generateStagingDeployCashBody(tag, [...basePRList, ...internalQAPRList]).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, [...basePRList, ...internalQAPRList]).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${baseExpectedOutput}` +
                         `${openCheckbox}${basePRList[2]}` +
                         `${lineBreak}${openCheckbox}${basePRList[0]}` +
@@ -579,20 +575,21 @@ describe('GithubUtils', () => {
                         `${lineBreak}${closedCheckbox}${basePRList[4]}` +
                         `${lineBreak}${closedCheckbox}${basePRList[5]}` +
                         `${lineBreak}${internalQAHeader}` +
-                        `${lineBreak}${openCheckbox}${internalQAPRList[0]}${assignOctocatHubot}` +
-                        `${lineBreak}${openCheckbox}${internalQAPRList[1]}${assignOctocatHubot}` +
+                        `${lineBreak}${openCheckbox}${internalQAPRList[0]}${assignOctocat}` +
+                        `${lineBreak}${openCheckbox}${internalQAPRList[1]}${assignOctocat}` +
                         `${lineBreakDouble}${deployerVerificationsHeader}` +
                         `${lineBreak}${openCheckbox}${timingDashboardVerification}` +
                         `${lineBreak}${openCheckbox}${firebaseVerification}` +
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual(['octocat']);
             });
         });
 
         test('Test some verified internalQA PRs', () => {
-            githubUtils.generateStagingDeployCashBody(tag, [...basePRList, ...internalQAPRList], [], [], [], [internalQAPRList[0]]).then((issueBody: string) => {
-                expect(issueBody).toBe(
+            githubUtils.generateStagingDeployCashBodyAndAssignees(tag, [...basePRList, ...internalQAPRList], [], [], [], [internalQAPRList[0]]).then((issue) => {
+                expect(issue.issueBody).toBe(
                     `${baseExpectedOutput}` +
                         `${openCheckbox}${basePRList[2]}` +
                         `${lineBreak}${openCheckbox}${basePRList[0]}` +
@@ -600,14 +597,15 @@ describe('GithubUtils', () => {
                         `${lineBreak}${closedCheckbox}${basePRList[4]}` +
                         `${lineBreak}${closedCheckbox}${basePRList[5]}` +
                         `${lineBreak}${internalQAHeader}` +
-                        `${lineBreak}${closedCheckbox}${internalQAPRList[0]}${assignOctocatHubot}` +
-                        `${lineBreak}${openCheckbox}${internalQAPRList[1]}${assignOctocatHubot}` +
+                        `${lineBreak}${closedCheckbox}${internalQAPRList[0]}${assignOctocat}` +
+                        `${lineBreak}${openCheckbox}${internalQAPRList[1]}${assignOctocat}` +
                         `${lineBreakDouble}${deployerVerificationsHeader}` +
                         `${lineBreak}${openCheckbox}${timingDashboardVerification}` +
                         `${lineBreak}${openCheckbox}${firebaseVerification}` +
                         `${lineBreak}${openCheckbox}${ghVerification}` +
                         `${lineBreakDouble}${ccApplauseLeads}`,
                 );
+                expect(issue.issueAssignees).toEqual(['octocat']);
             });
         });
     });
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index bf528eca3e81..5f0bb65cc3ab 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -1783,6 +1783,143 @@ describe('ReportActionsUtils', () => {
             input.pop();
             expect(result).toStrictEqual(expectedResult.reverse());
         });
+
+        it('given an empty input ID and the report only contains pending actions, it will return all actions', () => {
+            const input: ReportAction[] = [
+                // Given these sortedReportActions
+                {
+                    reportActionID: '1',
+                    previousReportActionID: undefined,
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '2',
+                    previousReportActionID: '1',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '3',
+                    previousReportActionID: '2',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '4',
+                    previousReportActionID: '3',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '5',
+                    previousReportActionID: '4',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '6',
+                    previousReportActionID: '5',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                {
+                    reportActionID: '7',
+                    previousReportActionID: '6',
+                    created: '2022-11-13 22:27:01.825',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+                    originalMessage: {
+                        html: 'Hello world',
+                        whisperedTo: [],
+                    },
+                    message: [
+                        {
+                            html: 'Hello world',
+                            type: 'Action type',
+                            text: 'Action text',
+                        },
+                    ],
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+            ];
+
+            const expectedResult = input;
+            // Reversing the input array to simulate descending order sorting as per our data structure
+            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '');
+            expect(result).toStrictEqual(expectedResult.reverse());
+        });
     });
 
     describe('getLastVisibleAction', () => {
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 9fbea1df862e..7b563d46b7eb 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -1,6 +1,7 @@
 import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import CONST from '../../src/CONST';
+import * as NumberUtils from '../../src/libs/NumberUtils';
 import * as ReportUtils from '../../src/libs/ReportUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
@@ -552,6 +553,7 @@ describe('ReportUtils', () => {
                 const paidPolicy = {
                     id: 'ef72dfeb',
                     type: CONST.POLICY.TYPE.TEAM,
+                    autoReporting: true,
                     autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
                 };
                 Promise.all([
@@ -638,6 +640,78 @@ describe('ReportUtils', () => {
         });
     });
 
+    describe('shouldDisableThread', () => {
+        const reportID = '1';
+
+        it('should disable on thread-disabled actions', () => {
+            const reportAction = ReportUtils.buildOptimisticCreatedReportAction('email1@test.com');
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+        });
+
+        it('should disable thread on split bill actions', () => {
+            const reportAction = ReportUtils.buildOptimisticIOUReportAction(
+                CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
+                50000,
+                CONST.CURRENCY.USD,
+                '',
+                [{login: 'email1@test.com'}, {login: 'email2@test.com'}],
+                NumberUtils.rand64(),
+            );
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+        });
+
+        it('should disable on deleted and not-thread actions', () => {
+            const reportAction = {
+                message: [
+                    {
+                        translationKey: '',
+                        type: 'COMMENT',
+                        html: '',
+                        text: '',
+                        isEdited: true,
+                    },
+                ],
+                childVisibleActionCount: 1,
+            };
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeFalsy();
+
+            reportAction.childVisibleActionCount = 0;
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+        });
+
+        it('should disable on archived reports and not-thread actions', () => {
+            Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
+                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+            })
+                .then(() => waitForBatchedUpdates())
+                .then(() => {
+                    const reportAction = {
+                        childVisibleActionCount: 1,
+                    };
+                    expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeFalsy();
+
+                    reportAction.childVisibleActionCount = 0;
+                    expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+                });
+        });
+
+        it("should disable on a whisper action and it's neither a report preview nor IOU action", () => {
+            const reportAction = {
+                actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE,
+                whisperedToAccountIDs: [123456],
+            };
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+        });
+
+        it('should disable on thread first chat', () => {
+            const reportAction = {
+                childReportID: reportID,
+            };
+            expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+        });
+    });
+
     describe('getAllAncestorReportActions', () => {
         const reports = [
             {reportID: '1', lastReadTime: '2024-02-01 04:56:47.233', reportName: 'Report'},
diff --git a/tsconfig.json b/tsconfig.json
index 79413fdd2ca7..d50f97a48aa2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -48,6 +48,6 @@
         }
     },
     "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
-    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*", "workflow_tests"],
+    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*", "workflow_tests", "scripts"],
     "extends": "expo/tsconfig.base"
 }
diff --git a/wdyr.js b/wdyr.ts
similarity index 76%
rename from wdyr.js
rename to wdyr.ts
index ad1edaa5a075..e5b40bc3b4c7 100644
--- a/wdyr.js
+++ b/wdyr.ts
@@ -1,12 +1,12 @@
 // Implements Why Did You Render (WDYR) in Dev
-import lodashGet from 'lodash/get';
+import type WhyDidYouRender from '@welldone-software/why-did-you-render';
 import React from 'react';
 import Config from 'react-native-config';
 
-const useWDYR = lodashGet(Config, 'USE_WDYR') === 'true';
+const useWDYR = Config?.USE_WDYR === 'true';
 
 if (useWDYR) {
-    const whyDidYouRender = require('@welldone-software/why-did-you-render');
+    const whyDidYouRender = require<typeof WhyDidYouRender>('@welldone-software/why-did-you-render');
     whyDidYouRender(React, {
         // Enable tracking in all pure components by default
         trackAllPureComponents: true,
diff --git a/workflow_tests/failureNotifier.test.js b/workflow_tests/failureNotifier.test.ts
similarity index 68%
rename from workflow_tests/failureNotifier.test.js
rename to workflow_tests/failureNotifier.test.ts
index d521c6cde00e..8dfc092c7e61 100644
--- a/workflow_tests/failureNotifier.test.js
+++ b/workflow_tests/failureNotifier.test.ts
@@ -1,28 +1,31 @@
-const path = require('path');
-const kieMockGithub = require('@kie/mock-github');
-const assertions = require('./assertions/failureNotifierAssertions');
-const mocks = require('./mocks/failureNotifierMocks');
-const ExtendedAct = require('./utils/ExtendedAct').default;
+import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
+import type {CreateRepositoryFile} from '@kie/mock-github';
+import {MockGithub} from '@kie/mock-github';
+import path from 'path';
+import assertions from './assertions/failureNotifierAssertions';
+import mocks from './mocks/failureNotifierMocks';
+import ExtendedAct from './utils/ExtendedAct';
 
 jest.setTimeout(90 * 1000);
-let mockGithub;
+let mockGithub: MockGithub;
+
 const FILES_TO_COPY_INTO_TEST_REPO = [
     {
         src: path.resolve(__dirname, '..', '.github', 'workflows', 'failureNotifier.yml'),
         dest: '.github/workflows/failureNotifier.yml',
     },
-];
+] as const satisfies CreateRepositoryFile[];
 
 describe('test workflow failureNotifier', () => {
     const actor = 'Dummy Actor';
     beforeEach(async () => {
         // create a local repository and copy required files
-        mockGithub = new kieMockGithub.MockGithub({
+        mockGithub = new MockGithub({
             repo: {
                 testFailureNotifierWorkflowRepo: {
                     files: FILES_TO_COPY_INTO_TEST_REPO,
 
-                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                    // if any branches besides main are needed add: pushedBranches: ['staging', 'production'],
                 },
             },
         });
@@ -34,11 +37,12 @@ describe('test workflow failureNotifier', () => {
         await mockGithub.teardown();
     });
     it('runs the notify failure when main fails', async () => {
-        const repoPath = mockGithub.repo.getPath('testFailureNotifierWorkflowRepo') || '';
+        const repoPath = mockGithub.repo.getPath('testFailureNotifierWorkflowRepo') ?? '';
         const workflowPath = path.join(repoPath, '.github', 'workflows', 'failureNotifier.yml');
         let act = new ExtendedAct(repoPath, workflowPath);
         const event = 'workflow_run';
         act = act.setEvent({
+            // eslint-disable-next-line @typescript-eslint/naming-convention
             workflow_run: {
                 name: 'Process new code merged to main',
                 conclusion: 'failure',
@@ -46,7 +50,8 @@ describe('test workflow failureNotifier', () => {
         });
         const testMockSteps = {
             notifyFailure: mocks.FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS,
-        };
+        } as const satisfies MockStep;
+
         const result = await act.runEvent(event, {
             workflowFile: path.join(repoPath, '.github', 'workflows', 'failureNotifier.yml'),
             mockSteps: testMockSteps,
diff --git a/workflow_tests/mocks/authorChecklistMocks.js b/workflow_tests/mocks/authorChecklistMocks.js
deleted file mode 100644
index b0fda86815db..000000000000
--- a/workflow_tests/mocks/authorChecklistMocks.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const utils = require('../utils/utils');
-
-// checklist
-const AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'CHECKLIST');
-const AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK = utils.createMockStep('authorChecklist.js', 'Running authorChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
-const AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS = [AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK, AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK];
-
-module.exports = {
-    AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/authorChecklistMocks.ts b/workflow_tests/mocks/authorChecklistMocks.ts
new file mode 100644
index 000000000000..b4d520eb7a1f
--- /dev/null
+++ b/workflow_tests/mocks/authorChecklistMocks.ts
@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// checklist
+const AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'CHECKLIST');
+const AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK = createMockStep('authorChecklist.js', 'Running authorChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS = [AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK, AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/cherryPickMocks.js b/workflow_tests/mocks/cherryPickMocks.ts
similarity index 51%
rename from workflow_tests/mocks/cherryPickMocks.js
rename to workflow_tests/mocks/cherryPickMocks.ts
index 5ce9b2ecccfb..f1508a3dc39d 100644
--- a/workflow_tests/mocks/cherryPickMocks.js
+++ b/workflow_tests/mocks/cherryPickMocks.ts
@@ -1,7 +1,8 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // validateactor
-const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = createMockStep(
     'Check if user is deployer',
     'Checking if user is a deployer',
     'VALIDATEACTOR',
@@ -9,7 +10,7 @@ const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = uti
     ['GITHUB_TOKEN'],
     {IS_DEPLOYER: true},
 );
-const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK = createMockStep(
     'Check if user is deployer',
     'Checking if user is a deployer',
     'VALIDATEACTOR',
@@ -17,11 +18,11 @@ const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK = ut
     ['GITHUB_TOKEN'],
     {IS_DEPLOYER: false},
 );
-const CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK];
-const CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK];
+const CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK] as const;
+const CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK] as const;
 
 // createnewversion
-const CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK = createMockStep(
     'Create new version',
     'Creating new version',
     'CREATENEWVERSION',
@@ -32,19 +33,19 @@ const CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.create
     true,
     'createNewVersion',
 );
-const CHERRYPICK__CREATENEWVERSION__STEP_MOCKS = [CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+const CHERRYPICK__CREATENEWVERSION__STEP_MOCKS = [CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK] as const;
 
 // cherrypick
-const CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'CHERRYPICK', ['ref', 'token'], []);
-const CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep('Set up git for OSBotify', 'Setting up git for OSBotify', 'CHERRYPICK', ['GPG_PASSPHRASE'], [], {
+const CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK = createMockStep('Checkout staging branch', 'Checking out staging branch', 'CHERRYPICK', ['ref', 'token'], []);
+const CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Set up git for OSBotify', 'Setting up git for OSBotify', 'CHERRYPICK', ['GPG_PASSPHRASE'], [], {
     OS_BOTIFY_API_TOKEN: 'os_botify_api_token',
 });
-const CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK = utils.createMockStep('Get previous app version', 'Get previous app version', 'CHERRYPICK', ['SEMVER_LEVEL']);
-const CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK = utils.createMockStep('Fetch history of relevant refs', 'Fetch history of relevant refs', 'CHERRYPICK');
-const CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK = utils.createMockStep('Get version bump commit', 'Get version bump commit', 'CHERRYPICK', [], [], {
+const CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK = createMockStep('Get previous app version', 'Get previous app version', 'CHERRYPICK', ['SEMVER_LEVEL']);
+const CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK = createMockStep('Fetch history of relevant refs', 'Fetch history of relevant refs', 'CHERRYPICK');
+const CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK = createMockStep('Get version bump commit', 'Get version bump commit', 'CHERRYPICK', [], [], {
     VERSION_BUMP_SHA: 'version_bump_sha',
 });
-const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK = createMockStep(
     'Get merge commit for pull request to CP',
     'Get merge commit for pull request to CP',
     'CHERRYPICK',
@@ -52,14 +53,14 @@ const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK
     [],
     {MERGE_ACTOR: '@dummyauthor'},
 );
-const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK = createMockStep(
     'Cherry-pick the version-bump to staging',
     'Cherry-picking the version-bump to staging',
     'CHERRYPICK',
     [],
     [],
 );
-const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK = createMockStep(
     'Cherry-pick the merge commit of target PR',
     'Cherry-picking the merge commit of target PR',
     'CHERRYPICK',
@@ -68,7 +69,7 @@ const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_B
     {HAS_CONFLICTS: false},
 );
 // eslint-disable-next-line rulesdir/no-negated-variables
-const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK = createMockStep(
     'Cherry-pick the merge commit of target PR',
     'Cherry-picking the merge commit of target PR',
     'CHERRYPICK',
@@ -76,15 +77,15 @@ const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_B
     [],
     {HAS_CONFLICTS: true},
 );
-const CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK = utils.createMockStep('Push changes', 'Pushing changes', 'CHERRYPICK', [], []);
-const CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK = createMockStep('Push changes', 'Pushing changes', 'CHERRYPICK', [], []);
+const CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK = createMockStep(
     'Create Pull Request to manually finish CP',
     'Creating Pull Request to manually finish CP',
     'CHERRYPICK',
     [],
     ['GITHUB_TOKEN'],
 );
-const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK = createMockStep(
     'Announces a CP failure in the #announce Slack room',
     'Announcing a CP failure',
     'CHERRYPICK',
@@ -92,25 +93,21 @@ const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM_
     ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
 );
 
-const getCherryPickMockSteps = (upToDate, hasConflicts) => [
-    CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK,
-    hasConflicts
-        ? CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK
-        : CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK,
-    CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK,
-];
+const getCherryPickMockSteps = (upToDate: boolean, hasConflicts: boolean) =>
+    [
+        CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK,
+        hasConflicts
+            ? CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK
+            : CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK,
+        CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK,
+    ] as const;
 
-module.exports = {
-    CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-    CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
-    CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
-    getCherryPickMockSteps,
-};
+export {CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS, CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS, CHERRYPICK__CREATENEWVERSION__STEP_MOCKS, getCherryPickMockSteps};
diff --git a/workflow_tests/mocks/claMocks.js b/workflow_tests/mocks/claMocks.js
deleted file mode 100644
index d0a6793b93e6..000000000000
--- a/workflow_tests/mocks/claMocks.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const utils = require('../utils/utils');
-
-// cla
-const CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {match: ''});
-const CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {
-    match: 'I have read the CLA Document and I hereby sign the CLA',
-});
-const CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: ''});
-const CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: 'recheck'});
-const CLA__CLA__CLA_ASSISTANT__STEP_MOCK = utils.createMockStep(
-    'CLA Assistant',
-    'CLA Assistant',
-    'CLA',
-    ['path-to-signatures', 'path-to-document', 'branch', 'remote-organization-name', 'remote-repository-name', 'lock-pullrequest-aftermerge', 'allowlist'],
-    ['GITHUB_TOKEN', 'PERSONAL_ACCESS_TOKEN'],
-);
-const CLA__CLA__NO_MATCHES__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
-const CLA__CLA__CHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
-const CLA__CLA__RECHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
-
-module.exports = {
-    CLA__CLA__NO_MATCHES__STEP_MOCKS,
-    CLA__CLA__CHECK_MATCH__STEP_MOCKS,
-    CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/claMocks.ts b/workflow_tests/mocks/claMocks.ts
new file mode 100644
index 000000000000..ab2d5f15a756
--- /dev/null
+++ b/workflow_tests/mocks/claMocks.ts
@@ -0,0 +1,22 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// cla
+const CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK = createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK = createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {
+    match: 'I have read the CLA Document and I hereby sign the CLA',
+});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK = createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK = createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: 'recheck'});
+const CLA__CLA__CLA_ASSISTANT__STEP_MOCK = createMockStep(
+    'CLA Assistant',
+    'CLA Assistant',
+    'CLA',
+    ['path-to-signatures', 'path-to-document', 'branch', 'remote-organization-name', 'remote-repository-name', 'lock-pullrequest-aftermerge', 'allowlist'],
+    ['GITHUB_TOKEN', 'PERSONAL_ACCESS_TOKEN'],
+);
+const CLA__CLA__NO_MATCHES__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK] as const;
+const CLA__CLA__CHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK] as const;
+const CLA__CLA__RECHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK] as const;
+
+export {CLA__CLA__NO_MATCHES__STEP_MOCKS, CLA__CLA__CHECK_MATCH__STEP_MOCKS, CLA__CLA__RECHECK_MATCH__STEP_MOCKS};
diff --git a/workflow_tests/mocks/createNewVersionMocks.js b/workflow_tests/mocks/createNewVersionMocks.ts
similarity index 62%
rename from workflow_tests/mocks/createNewVersionMocks.js
rename to workflow_tests/mocks/createNewVersionMocks.ts
index a1f601aef47f..59aa6bc910a2 100644
--- a/workflow_tests/mocks/createNewVersionMocks.js
+++ b/workflow_tests/mocks/createNewVersionMocks.ts
@@ -1,39 +1,28 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // validateactor
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
     PERMISSION: 'admin',
 });
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
     PERMISSION: 'write',
 });
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
     PERMISSION: 'read',
 });
-const CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK];
-const CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK];
-const CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK];
+const CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK] as const;
+const CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK] as const;
+const CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK] as const;
 
 // createnewversion
-const CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK = utils.createMockStep('Run turnstyle', 'Run turnstyle', 'CREATENEWVERSION', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
-const CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK = utils.createMockStep('Check out', 'Check out', 'CREATENEWVERSION', ['ref', 'token'], []);
-const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
-    'Setup git for OSBotify',
-    'Setup git for OSBotify',
-    'CREATENEWVERSION',
-    ['GPG_PASSPHRASE'],
-    [],
-);
-const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = utils.createMockStep(
-    'Generate version',
-    'Generate version',
-    'CREATENEWVERSION',
-    ['GITHUB_TOKEN', 'SEMVER_LEVEL'],
-    [],
-);
-const CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK = utils.createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], []);
-const CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK = utils.createMockStep('Update main branch', 'Update main branch', 'CREATENEWVERSION', [], []);
-const CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+const CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK = createMockStep('Run turnstyle', 'Run turnstyle', 'CREATENEWVERSION', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK = createMockStep('Check out', 'Check out', 'CREATENEWVERSION', ['ref', 'token'], []);
+const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setup git for OSBotify', 'CREATENEWVERSION', ['GPG_PASSPHRASE'], []);
+const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = createMockStep('Generate version', 'Generate version', 'CREATENEWVERSION', ['GITHUB_TOKEN', 'SEMVER_LEVEL'], []);
+const CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK = createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK = createMockStep('Update main branch', 'Update main branch', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
     'Announce failed workflow in Slack',
     'Announce failed workflow in Slack',
     'CREATENEWVERSION',
@@ -48,9 +37,9 @@ const CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS = [
     CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK,
     CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK,
     CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
+export {
     CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
     CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS,
     CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS,
diff --git a/workflow_tests/mocks/deployBlockerMocks.js b/workflow_tests/mocks/deployBlockerMocks.ts
similarity index 60%
rename from workflow_tests/mocks/deployBlockerMocks.js
rename to workflow_tests/mocks/deployBlockerMocks.ts
index 4f74e0b91ebb..932d4626b67b 100644
--- a/workflow_tests/mocks/deployBlockerMocks.js
+++ b/workflow_tests/mocks/deployBlockerMocks.ts
@@ -1,33 +1,28 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // updateChecklist
-const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK = utils.createMockStep('updateChecklist', 'Run updateChecklist', 'UPDATECHECKLIST');
-const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS = [DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK];
+const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK = createMockStep('updateChecklist', 'Run updateChecklist', 'UPDATECHECKLIST');
+const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS = [DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK] as const;
 
 // deployblocker
-const DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DEPLOYBLOCKER');
-const DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_LABELS__STEP_MOCK = utils.createMockStep(
+const DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'DEPLOYBLOCKER');
+const DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_LABELS__STEP_MOCK = createMockStep(
     'Give the issue/PR the Hourly, Engineering labels',
     'Give the issue/PR the Hourly, Engineering labels',
     'DEPLOYBLOCKER',
     [],
     ['GITHUB_TOKEN'],
 );
-const DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+const DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK = createMockStep(
     'Post the issue in the #expensify-open-source slack room',
     'Post the issue in the expensify-open-source slack room',
     'DEPLOYBLOCKER',
     ['status'],
     ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
 );
-const DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEPLOY_BLOCKER__STEP_MOCK = utils.createMockStep(
-    'Comment on deploy blocker',
-    'Comment on deploy blocker',
-    'DEPLOYBLOCKER',
-    [],
-    ['GITHUB_TOKEN'],
-);
-const DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+const DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEPLOY_BLOCKER__STEP_MOCK = createMockStep('Comment on deploy blocker', 'Comment on deploy blocker', 'DEPLOYBLOCKER', [], ['GITHUB_TOKEN']);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
     'Announce failed workflow in Slack',
     'Announce failed workflow in Slack',
     'DEPLOYBLOCKER',
@@ -40,9 +35,6 @@ const DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS = [
     DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK,
     DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEPLOY_BLOCKER__STEP_MOCK,
     DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
-    DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS,
-    DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
-};
+export {DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS, DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS};
diff --git a/workflow_tests/mocks/deployMocks.js b/workflow_tests/mocks/deployMocks.js
deleted file mode 100644
index 9e8b978f05ac..000000000000
--- a/workflow_tests/mocks/deployMocks.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const utils = require('../utils/utils');
-
-const DEPLOY_STAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'DEPLOY_STAGING', ['ref', 'token']);
-const DEPLOY_STAGING__SETUP_GIT__STEP_MOCK = utils.createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_STAGING', [
-    'GPG_PASSPHRASE',
-    'OS_BOTIFY_APP_ID',
-    'OS_BOTIFY_PRIVATE_KEY',
-]);
-const DEPLOY_STAGING__TAG_VERSION__STEP_MOCK = utils.createMockStep('Tag version', 'Tagging new version', 'DEPLOY_STAGING');
-const DEPLOY_STAGING__PUSH_TAG__STEP_MOCK = utils.createMockStep('🚀 Push tags to trigger staging deploy 🚀', 'Pushing tag to trigger staging deploy', 'DEPLOY_STAGING');
-const DEPLOY_STAGING_STEP_MOCKS = [DEPLOY_STAGING__CHECKOUT__STEP_MOCK, DEPLOY_STAGING__SETUP_GIT__STEP_MOCK, DEPLOY_STAGING__TAG_VERSION__STEP_MOCK, DEPLOY_STAGING__PUSH_TAG__STEP_MOCK];
-
-const DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DEPLOY_PRODUCTION', ['ref', 'token']);
-const DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK = utils.createMockStep(
-    'Setup git for OSBotify',
-    'Setting up git for OSBotify',
-    'DEPLOY_PRODUCTION',
-    ['GPG_PASSPHRASE', 'OS_BOTIFY_APP_ID', 'OS_BOTIFY_PRIVATE_KEY'],
-    null,
-    {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'},
-);
-const DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK = utils.createMockStep('Get current app version', 'Getting current app version', 'DEPLOY_PRODUCTION', null, null, null, {
-    PRODUCTION_VERSION: '1.2.3',
-});
-const DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK = utils.createMockStep(
-    'Get Release Pull Request List',
-    'Getting release PR list',
-    'DEPLOY_PRODUCTION',
-    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
-    null,
-    {PR_LIST: '["1.2.1", "1.2.2"]'},
-);
-const DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK = utils.createMockStep('Generate Release Body', 'Generating release body', 'DEPLOY_PRODUCTION', ['PR_LIST'], null, {
-    RELEASE_BODY: 'Release body',
-});
-const DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK = utils.createMockStep(
-    '🚀 Create release to trigger production deploy 🚀',
-    'Creating release to trigger production deploy',
-    'DEPLOY_PRODUCTION',
-    ['tag_name', 'body'],
-    ['GITHUB_TOKEN'],
-);
-const DEPLOY_PRODUCTION_STEP_MOCKS = [
-    DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK,
-    DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK,
-    DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK,
-    DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK,
-    DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK,
-    DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK,
-];
-
-module.exports = {
-    DEPLOY_STAGING_STEP_MOCKS,
-    DEPLOY_PRODUCTION_STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/deployMocks.ts b/workflow_tests/mocks/deployMocks.ts
new file mode 100644
index 000000000000..d0795477cfca
--- /dev/null
+++ b/workflow_tests/mocks/deployMocks.ts
@@ -0,0 +1,58 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+const DEPLOY_STAGING__CHECKOUT__STEP_MOCK = createMockStep('Checkout staging branch', 'Checking out staging branch', 'DEPLOY_STAGING', ['ref', 'token']);
+const DEPLOY_STAGING__SETUP_GIT__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_STAGING', [
+    'GPG_PASSPHRASE',
+    'OS_BOTIFY_APP_ID',
+    'OS_BOTIFY_PRIVATE_KEY',
+]);
+const DEPLOY_STAGING__TAG_VERSION__STEP_MOCK = createMockStep('Tag version', 'Tagging new version', 'DEPLOY_STAGING');
+const DEPLOY_STAGING__PUSH_TAG__STEP_MOCK = createMockStep('🚀 Push tags to trigger staging deploy 🚀', 'Pushing tag to trigger staging deploy', 'DEPLOY_STAGING');
+const DEPLOY_STAGING_STEP_MOCKS = [
+    DEPLOY_STAGING__CHECKOUT__STEP_MOCK,
+    DEPLOY_STAGING__SETUP_GIT__STEP_MOCK,
+    DEPLOY_STAGING__TAG_VERSION__STEP_MOCK,
+    DEPLOY_STAGING__PUSH_TAG__STEP_MOCK,
+] as const;
+
+const DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'DEPLOY_PRODUCTION', ['ref', 'token']);
+const DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK = createMockStep(
+    'Setup git for OSBotify',
+    'Setting up git for OSBotify',
+    'DEPLOY_PRODUCTION',
+    ['GPG_PASSPHRASE', 'OS_BOTIFY_APP_ID', 'OS_BOTIFY_PRIVATE_KEY'],
+    null,
+    {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'},
+);
+const DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK = createMockStep('Get current app version', 'Getting current app version', 'DEPLOY_PRODUCTION', null, null, null, {
+    PRODUCTION_VERSION: '1.2.3',
+});
+const DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK = createMockStep(
+    'Get Release Pull Request List',
+    'Getting release PR list',
+    'DEPLOY_PRODUCTION',
+    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
+    null,
+    {PR_LIST: '["1.2.1", "1.2.2"]'},
+);
+const DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK = createMockStep('Generate Release Body', 'Generating release body', 'DEPLOY_PRODUCTION', ['PR_LIST'], null, {
+    RELEASE_BODY: 'Release body',
+});
+const DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK = createMockStep(
+    '🚀 Create release to trigger production deploy 🚀',
+    'Creating release to trigger production deploy',
+    'DEPLOY_PRODUCTION',
+    ['tag_name', 'body'],
+    ['GITHUB_TOKEN'],
+);
+const DEPLOY_PRODUCTION_STEP_MOCKS = [
+    DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK,
+    DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK,
+    DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK,
+    DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK,
+    DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK,
+    DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK,
+] as const;
+
+export {DEPLOY_STAGING_STEP_MOCKS, DEPLOY_PRODUCTION_STEP_MOCKS};
diff --git a/workflow_tests/mocks/failureNotifierMocks.js b/workflow_tests/mocks/failureNotifierMocks.js
deleted file mode 100644
index 6d37f08ff7ac..000000000000
--- a/workflow_tests/mocks/failureNotifierMocks.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable rulesdir/no-negated-variables */
-const utils = require('../utils/utils');
-
-// notifyfailure
-const FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK = utils.createMockStep('Fetch Workflow Run Jobs', 'Fetch Workflow Run Jobs', 'NOTIFYFAILURE', [], []);
-const FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK = utils.createMockStep('Process Each Failed Job', 'Process Each Failed Job', 'NOTIFYFAILURE', [], []);
-const FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS = [FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK, FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK];
-
-module.exports = {
-    FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/failureNotifierMocks.ts b/workflow_tests/mocks/failureNotifierMocks.ts
new file mode 100644
index 000000000000..5c869adae21b
--- /dev/null
+++ b/workflow_tests/mocks/failureNotifierMocks.ts
@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+/* eslint-disable rulesdir/no-negated-variables */
+import {createMockStep} from '../utils/utils';
+
+// notifyfailure
+const FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK = createMockStep('Fetch Workflow Run Jobs', 'Fetch Workflow Run Jobs', 'NOTIFYFAILURE', [], []);
+const FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK = createMockStep('Process Each Failed Job', 'Process Each Failed Job', 'NOTIFYFAILURE', [], []);
+const FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS = [
+    FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK,
+    FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK,
+] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/finishReleaseCycleMocks.js b/workflow_tests/mocks/finishReleaseCycleMocks.ts
similarity index 84%
rename from workflow_tests/mocks/finishReleaseCycleMocks.js
rename to workflow_tests/mocks/finishReleaseCycleMocks.ts
index 29e0842852dc..360bb017da88 100644
--- a/workflow_tests/mocks/finishReleaseCycleMocks.js
+++ b/workflow_tests/mocks/finishReleaseCycleMocks.ts
@@ -1,8 +1,9 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // validate
-const FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VALIDATE', ['ref', 'token']);
-const FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VALIDATE', ['ref', 'token']);
+const FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep(
     'Setup git for OSBotify',
     'Setup git for OSBotify',
     'VALIDATE',
@@ -10,7 +11,7 @@ const FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.cr
     [],
     {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'},
 );
-const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK = createMockStep(
     'Validate actor is deployer',
     'Validating if actor is deployer',
     'VALIDATE',
@@ -18,7 +19,7 @@ const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK =
     ['GITHUB_TOKEN'],
     {IS_DEPLOYER: true},
 );
-const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK = createMockStep(
     'Validate actor is deployer',
     'Validating if actor is deployer',
     'VALIDATE',
@@ -27,14 +28,14 @@ const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK
     {IS_DEPLOYER: false},
 );
 // eslint-disable-next-line rulesdir/no-negated-variables
-const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK = createMockStep(
     'Reopen and comment on issue (not a team member)',
     'Reopening issue - not a team member',
     'VALIDATE',
     ['GITHUB_TOKEN', 'ISSUE_NUMBER', 'COMMENT'],
     [],
 );
-const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK = createMockStep(
     'Check for any deploy blockers',
     'Checking for deploy blockers',
     'VALIDATE',
@@ -42,7 +43,7 @@ const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MO
     [],
     {HAS_DEPLOY_BLOCKERS: false},
 );
-const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK = createMockStep(
     'Check for any deploy blockers',
     'Checking for deploy blockers',
     'VALIDATE',
@@ -50,14 +51,14 @@ const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOC
     [],
     {HAS_DEPLOY_BLOCKERS: true},
 );
-const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK = createMockStep(
     'Reopen and comment on issue (has blockers)',
     'Reopening issue - blockers',
     'VALIDATE',
     ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
     [],
 );
-const FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
     'Announce failed workflow in Slack',
     'Announce failed workflow in Slack',
     'VALIDATE',
@@ -72,7 +73,7 @@ const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
@@ -81,7 +82,7 @@ const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 // eslint-disable-next-line rulesdir/no-negated-variables
 const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
@@ -91,7 +92,7 @@ const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 // eslint-disable-next-line rulesdir/no-negated-variables
 const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
@@ -101,19 +102,19 @@ const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
     FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
     FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 
 // updateproduction
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATEPRODUCTION', ['ref', 'token'], []);
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'UPDATEPRODUCTION', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep(
     'Setup git for OSBotify',
     'Setup git for OSBotify',
     'UPDATEPRODUCTION',
     ['GPG_PASSPHRASE'],
     [],
 );
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK = utils.createMockStep('Update production branch', 'Updating production branch', 'UPDATEPRODUCTION', [], []);
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK = createMockStep('Update production branch', 'Updating production branch', 'UPDATEPRODUCTION', [], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
     'Announce failed workflow in Slack',
     'Announce failed workflow in Slack',
     'UPDATEPRODUCTION',
@@ -125,10 +126,10 @@ const FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS = [
     FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
     FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK,
     FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 
 // createnewpatchversion
-const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK = createMockStep(
     'Create new version',
     'Creating new version',
     'CREATENEWPATCHVERSION',
@@ -139,25 +140,19 @@ const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK =
     true,
     'createNewVersion',
 );
-const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS = [FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS = [FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK] as const;
 
 // updatestaging
-const FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATESTAGING', ['ref', 'token'], []);
-const FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
-    'Setup git for OSBotify',
-    'Setup git for OSBotify',
-    'UPDATESTAGING',
-    ['GPG_PASSPHRASE'],
-    [],
-);
-const FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'UPDATESTAGING', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setup git for OSBotify', 'UPDATESTAGING', ['GPG_PASSPHRASE'], []);
+const FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK = createMockStep(
     'Update staging branch to trigger staging deploy',
     'Updating staging branch',
     'UPDATESTAGING',
     [],
     [],
 );
-const FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+const FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
     'Announce failed workflow in Slack',
     'Announce failed workflow in Slack',
     'UPDATESTAGING',
@@ -169,9 +164,9 @@ const FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS = [
     FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
     FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK,
     FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
+export {
     FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
     FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
     FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
diff --git a/workflow_tests/mocks/lintMocks.js b/workflow_tests/mocks/lintMocks.js
deleted file mode 100644
index 1fc5dbfd526f..000000000000
--- a/workflow_tests/mocks/lintMocks.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const utils = require('../utils/utils');
-
-// lint
-const LINT__LINT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'LINT', [], []);
-const LINT__LINT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'LINT', [], []);
-const LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK = utils.createMockStep('Lint JavaScript and Typescript with ESLint', 'Lint JavaScript with ESLint', 'LINT', [], ['CI']);
-const LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK = utils.createMockStep("Verify there's no Prettier diff", 'Verify theres no Prettier diff', 'LINT');
-const LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK = utils.createMockStep('Run unused style searcher', 'Run unused style searcher', 'LINT');
-const LINT__LINT__STEP_MOCKS = [
-    LINT__LINT__CHECKOUT__STEP_MOCK,
-    LINT__LINT__SETUP_NODE__STEP_MOCK,
-    LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK,
-    LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK,
-    LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK,
-];
-
-module.exports = {
-    LINT__LINT__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/lintMocks.ts b/workflow_tests/mocks/lintMocks.ts
new file mode 100644
index 000000000000..93a3fd190a41
--- /dev/null
+++ b/workflow_tests/mocks/lintMocks.ts
@@ -0,0 +1,21 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// lint
+const LINT__LINT__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'LINT', [], []);
+const LINT__LINT__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'LINT', [], []);
+const LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK = createMockStep('Lint JavaScript and Typescript with ESLint', 'Lint JavaScript with ESLint', 'LINT', [], ['CI']);
+const LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK = createMockStep("Verify there's no Prettier diff", 'Verify theres no Prettier diff', 'LINT');
+const LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK = createMockStep('Run unused style searcher', 'Run unused style searcher', 'LINT');
+const LINT__LINT__STEP_MOCKS = [
+    LINT__LINT__CHECKOUT__STEP_MOCK,
+    LINT__LINT__SETUP_NODE__STEP_MOCK,
+    LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK,
+    LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK,
+    LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK,
+] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    LINT__LINT__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/lockDeploysMocks.js b/workflow_tests/mocks/lockDeploysMocks.ts
similarity index 69%
rename from workflow_tests/mocks/lockDeploysMocks.js
rename to workflow_tests/mocks/lockDeploysMocks.ts
index bb6246a2e1d9..2c9aa1fd6d11 100644
--- a/workflow_tests/mocks/lockDeploysMocks.js
+++ b/workflow_tests/mocks/lockDeploysMocks.ts
@@ -1,22 +1,23 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // lockstagingdeploys
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'LOCKSTAGINGDEPLOYS', ['ref', 'token'], []);
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK = utils.createMockStep(
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'LOCKSTAGINGDEPLOYS', ['ref', 'token'], []);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK = createMockStep(
     'Wait for staging deploys to finish',
     'Waiting for staging deploys to finish',
     'LOCKSTAGINGDEPLOYS',
     ['GITHUB_TOKEN'],
     [],
 );
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK = utils.createMockStep(
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK = createMockStep(
     'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
     'Commenting in StagingDeployCash',
     'LOCKSTAGINGDEPLOYS',
     [],
     ['GITHUB_TOKEN'],
 );
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK = utils.createMockStep(
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK = createMockStep(
     'Announce failed workflow',
     'Announcing failed workflow in Slack',
     'LOCKSTAGINGDEPLOYS',
@@ -28,8 +29,9 @@ const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS = [
     LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK,
     LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK,
     LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
+export {
+    // eslint-disable-next-line import/prefer-default-export
     LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
 };
diff --git a/workflow_tests/mocks/platformDeployMocks.js b/workflow_tests/mocks/platformDeployMocks.ts
similarity index 54%
rename from workflow_tests/mocks/platformDeployMocks.js
rename to workflow_tests/mocks/platformDeployMocks.ts
index 3fe8de8cca3d..72176e34d1fa 100644
--- a/workflow_tests/mocks/platformDeployMocks.js
+++ b/workflow_tests/mocks/platformDeployMocks.ts
@@ -1,7 +1,8 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // validateActor
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK = createMockStep(
     'Check if user is deployer',
     'Checking if the user is a deployer',
     'VALIDATE_ACTOR',
@@ -9,7 +10,7 @@ const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MO
     ['GITHUB_TOKEN'],
     {IS_DEPLOYER: true},
 );
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK = createMockStep(
     'Check if user is deployer',
     'Checking if the user is a deployer',
     'VALIDATE_ACTOR',
@@ -17,42 +18,42 @@ const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK
     ['GITHUB_TOKEN'],
     {IS_DEPLOYER: false},
 );
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK];
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK];
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK] as const;
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK] as const;
 
 // deployChecklist
-const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCK = utils.createMockStep('deployChecklist', 'Run deployChecklist', 'DEPLOY_CHECKLIST');
-const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS = [PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCK];
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCK = createMockStep('deployChecklist', 'Run deployChecklist', 'DEPLOY_CHECKLIST');
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS = [PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCK] as const;
 
 // android
-const PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__SETUP_JAVA__STEP_MOCK = utils.createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
-const PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'ANDROID', ['ruby-version', 'bundler-cache']);
-const PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypting keystore', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypting JSON key', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version in ENV', 'Setting version in ENV', 'ANDROID', null, null, null, {VERSION_CODE: '1.2.3'});
-const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = utils.createMockStep('Run Fastlane beta', 'Running Fastlane beta', 'ANDROID', null, [
+const PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_JAVA__STEP_MOCK = createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
+const PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setting up Ruby', 'ANDROID', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = createMockStep('Decrypt keystore', 'Decrypting keystore', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = createMockStep('Decrypt json key', 'Decrypting JSON key', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK = createMockStep('Set version in ENV', 'Setting version in ENV', 'ANDROID', null, null, null, {VERSION_CODE: '1.2.3'});
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = createMockStep('Run Fastlane beta', 'Running Fastlane beta', 'ANDROID', null, [
     'MYAPP_UPLOAD_STORE_PASSWORD',
     'MYAPP_UPLOAD_KEY_PASSWORD',
 ]);
-const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = utils.createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']);
-const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
-const PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']);
+const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
+const PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep(
     'Upload Android version to GitHub artifacts',
     'Upload Android version to GitHub artifacts',
     'ANDROID',
     ['name', 'path'],
 );
-const PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK = createMockStep(
     'Upload Android version to Browser Stack',
     'Uploading Android version to Browser Stack',
     'ANDROID',
     null,
     ['BROWSERSTACK'],
 );
-const PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK = createMockStep(
     'Warn deployers if Android production deploy failed',
     'Warning deployers of failed production deploy',
     'ANDROID',
@@ -74,15 +75,15 @@ const PLATFORM_DEPLOY__ANDROID__STEP_MOCKS = [
     PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK,
-];
+] as const;
 
 // desktop
-const PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DESKTOP');
-const PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'DESKTOP');
-const PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK = utils.createMockStep('Decrypt Developer ID Certificate', 'Decrypting developer id certificate', 'DESKTOP', null, [
+const PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK = createMockStep('Decrypt Developer ID Certificate', 'Decrypting developer id certificate', 'DESKTOP', null, [
     'DEVELOPER_ID_SECRET_PASSPHRASE',
 ]);
-const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build production desktop app', 'Building production desktop app', 'DESKTOP', null, [
+const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = createMockStep('Build production desktop app', 'Building production desktop app', 'DESKTOP', null, [
     'CSC_LINK',
     'CSC_KEY_PASSWORD',
     'APPLE_ID',
@@ -90,7 +91,7 @@ const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = utils.createMockSt
     'AWS_ACCESS_KEY_ID',
     'AWS_SECRET_ACCESS_KEY',
 ]);
-const PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build staging desktop app', 'Building staging desktop app', 'DESKTOP', null, [
+const PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK = createMockStep('Build staging desktop app', 'Building staging desktop app', 'DESKTOP', null, [
     'CSC_LINK',
     'CSC_KEY_PASSWORD',
     'APPLE_ID',
@@ -104,50 +105,43 @@ const PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS = [
     PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK,
     PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK,
     PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK,
-];
+] as const;
 
 // ios
-const PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'IOS');
-const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
-const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'IOS');
-const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']);
-const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+const PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'IOS');
+const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
     'cache-hit': false,
 });
-const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep(
-    'Compare Podfile.lock and Manifest.lock',
-    'Compare Podfile.lock and Manifest.lock',
-    'IOS',
-    [],
-    [],
-    {IS_PODFILE_SAME_AS_MANIFEST: false},
-);
-const PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Installing cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt AppStore profile', 'Decrypting profile', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_NSE_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt AppStore Notification Service profile', 'Decrypting profile', 'IOS', null, [
+const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
+    IS_PODFILE_SAME_AS_MANIFEST: false,
+});
+const PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK = createMockStep('Install cocoapods', 'Installing cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_PROFILE__STEP_MOCK = createMockStep('Decrypt AppStore profile', 'Decrypting profile', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_NSE_PROFILE__STEP_MOCK = createMockStep('Decrypt AppStore Notification Service profile', 'Decrypting profile', 'IOS', null, [
     'LARGE_SECRET_PASSPHRASE',
 ]);
-const PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypting certificate', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK = utils.createMockStep('Decrypt App Store Connect API key', 'Decrypting App Store API key', 'IOS', null, [
+const PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = createMockStep('Decrypt certificate', 'Decrypting certificate', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK = createMockStep('Decrypt App Store Connect API key', 'Decrypting App Store API key', 'IOS', null, [
     'LARGE_SECRET_PASSPHRASE',
 ]);
-const PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Running Fastlane', 'IOS', null, [
+const PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK = createMockStep('Run Fastlane', 'Running Fastlane', 'IOS', null, [
     'APPLE_CONTACT_EMAIL',
     'APPLE_CONTACT_PHONE',
     'APPLE_DEMO_EMAIL',
     'APPLE_DEMO_PASSWORD',
 ]);
-const PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive iOS sourcemaps', 'Archiving sourcemaps', 'IOS', ['name', 'path']);
-const PLATFORM_DEPLOY__IOS__UPLOAD_IOS_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = utils.createMockStep(
-    'Upload iOS version to GitHub artifacts',
-    'Upload iOS version to GitHub artifacts',
-    'IOS',
-    ['name', 'path'],
-);
-const PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK = utils.createMockStep('Upload iOS version to Browser Stack', 'Uploading version to Browser Stack', 'IOS', null, ['BROWSERSTACK']);
-const PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set iOS version in ENV', 'Setting iOS version', 'IOS', null, null, null, {IOS_VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane for App Store release', 'Running Fastlane for release', 'IOS', null, ['VERSION']);
-const PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive iOS sourcemaps', 'Archiving sourcemaps', 'IOS', ['name', 'path']);
+const PLATFORM_DEPLOY__IOS__UPLOAD_IOS_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep('Upload iOS version to GitHub artifacts', 'Upload iOS version to GitHub artifacts', 'IOS', [
+    'name',
+    'path',
+]);
+const PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK = createMockStep('Upload iOS version to Browser Stack', 'Uploading version to Browser Stack', 'IOS', null, ['BROWSERSTACK']);
+const PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK = createMockStep('Set iOS version in ENV', 'Setting iOS version', 'IOS', null, null, null, {IOS_VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK = createMockStep('Run Fastlane for App Store release', 'Running Fastlane for release', 'IOS', null, ['VERSION']);
+const PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK = createMockStep(
     'Warn deployers if iOS production deploy failed',
     'Warning developers of failed deploy',
     'IOS',
@@ -173,25 +167,25 @@ const PLATFORM_DEPLOY__IOS__STEP_MOCKS = [
     PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK,
     PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK,
     PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK,
-];
+] as const;
 
 // web
-const PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'WEB');
-const PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'WEB');
-const PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK = utils.createMockStep('Setup Cloudflare CLI', 'Setting up Cloudflare CLI', 'WEB');
-const PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep('Configure AWS Credentials', 'Configuring AWS credentials', 'WEB', [
+const PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'WEB');
+const PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'WEB');
+const PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK = createMockStep('Setup Cloudflare CLI', 'Setting up Cloudflare CLI', 'WEB');
+const PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK = createMockStep('Configure AWS Credentials', 'Configuring AWS credentials', 'WEB', [
     'aws-access-key-id',
     'aws-secret-access-key',
     'aws-region',
 ]);
-const PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build web for production', 'Building web for production', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build web for staging', 'Building web for staging', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK = utils.createMockStep('Build storybook docs for production', 'Build storybook docs for production', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK = utils.createMockStep('Build storybook docs for staging', 'Build storybook docs for staging', 'WEB');
-const PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK = utils.createMockStep('Deploy production to S3', 'Deploying production to S3', 'WEB');
-const PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK = utils.createMockStep('Deploy staging to S3', 'Deploying staging to S3', 'WEB');
-const PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK = utils.createMockStep('Purge production Cloudflare cache', 'Purging production Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
-const PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK = utils.createMockStep('Purge staging Cloudflare cache', 'Purging staging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK = createMockStep('Build web for production', 'Building web for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK = createMockStep('Build web for staging', 'Building web for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK = createMockStep('Build storybook docs for production', 'Build storybook docs for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK = createMockStep('Build storybook docs for staging', 'Build storybook docs for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK = createMockStep('Deploy production to S3', 'Deploying production to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK = createMockStep('Deploy staging to S3', 'Deploying staging to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK = createMockStep('Purge production Cloudflare cache', 'Purging production Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK = createMockStep('Purge staging Cloudflare cache', 'Purging staging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
 const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
     PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK,
@@ -205,32 +199,32 @@ const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
     PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK,
     PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK,
-];
+] as const;
 
 // post slack message on failure
-const PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK = utils.createMockStep('Post Slack message on failure', 'Posting Slack message on platform deploy failure', 'POST_SLACK_FAIL', [
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK = createMockStep('Post Slack message on failure', 'Posting Slack message on platform deploy failure', 'POST_SLACK_FAIL', [
     'SLACK_WEBHOOK',
 ]);
-const PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS = [PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK];
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS = [PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK] as const;
 
 // post slack message on success
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_SLACK_SUCCESS');
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_SLACK_SUCCESS', null, null, null, {VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'POST_SLACK_SUCCESS');
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK = createMockStep('Set version', 'Setting version', 'POST_SLACK_SUCCESS', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK = createMockStep(
     'Announces the deploy in the #announce Slack room',
     'Posting message to \\#announce channel',
     'POST_SLACK_SUCCESS',
     ['status'],
     ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
 );
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK = createMockStep(
     'Announces the deploy in the #deployer Slack room',
     'Posting message to \\#deployer channel',
     'POST_SLACK_SUCCESS',
     ['status'],
     ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
 );
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK = createMockStep(
     'Announces a production deploy in the #expensify-open-source Slack room',
     'Posting message to \\#expensify-open-source channel',
     'POST_SLACK_SUCCESS',
@@ -243,13 +237,13 @@ const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS = [
     PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK,
     PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK,
     PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK,
-];
+] as const;
 
 // post github comment
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_GITHUB_COMMENT');
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'POST_GITHUB_COMMENT');
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_GITHUB_COMMENT', null, null, null, {VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = utils.createMockStep(
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK = createMockStep('Set version', 'Setting version', 'POST_GITHUB_COMMENT', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = createMockStep(
     'Get Release Pull Request List',
     'Getting release pull request list',
     'POST_GITHUB_COMMENT',
@@ -257,7 +251,7 @@ const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = utils.create
     null,
     {PR_LIST: '[1.2.1, 1.2.2]'},
 );
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK = utils.createMockStep('Comment on issues', 'Commenting on issues', 'POST_GITHUB_COMMENT', [
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK = createMockStep('Comment on issues', 'Commenting on issues', 'POST_GITHUB_COMMENT', [
     'PR_LIST',
     'IS_PRODUCTION_DEPLOY',
     'DEPLOY_VERSION',
@@ -273,9 +267,9 @@ const PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS = [
     PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK,
     PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK,
     PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
+export {
     PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS,
     PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
     PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
diff --git a/workflow_tests/mocks/preDeployMocks.js b/workflow_tests/mocks/preDeployMocks.js
deleted file mode 100644
index daadf3d0c743..000000000000
--- a/workflow_tests/mocks/preDeployMocks.js
+++ /dev/null
@@ -1,103 +0,0 @@
-const utils = require('../utils/utils');
-
-// typecheck
-const TYPECHECK_WORKFLOW_MOCK_STEP = utils.createMockStep('Run typecheck workflow', 'Running typecheck workflow', 'TYPECHECK');
-const TYPECHECK_JOB_MOCK_STEPS = [TYPECHECK_WORKFLOW_MOCK_STEP];
-
-// lint
-const LINT_WORKFLOW_MOCK_STEP = utils.createMockStep('Run lint workflow', 'Running lint workflow', 'LINT');
-const LINT_JOB_MOCK_STEPS = [LINT_WORKFLOW_MOCK_STEP];
-
-// test
-const TEST_WORKFLOW_MOCK_STEP = utils.createMockStep('Run test workflow', 'Running test workflow', 'TEST');
-const TEST_JOB_MOCK_STEPS = [TEST_WORKFLOW_MOCK_STEP];
-
-// confirm_passing_build
-const ANNOUNCE_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in slack', 'CONFIRM_PASSING_BUILD', ['SLACK_WEBHOOK']);
-const CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS = [
-    ANNOUNCE_IN_SLACK_MOCK_STEP,
-
-    // 2nd step runs normally
-];
-
-// choose_deploy_actions
-const GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY = utils.createMockStep('Get merged pull request', 'Getting merged pull request', 'CHOOSE_DEPLOY_ACTIONS', ['github_token'], null, {
-    number: '123',
-    labels: '[]',
-});
-const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED = utils.createMockStep(
-    'Check if StagingDeployCash is locked',
-    'Checking StagingDeployCash',
-    'CHOOSE_DEPLOY_ACTIONS',
-    ['GITHUB_TOKEN'],
-    null,
-    {IS_LOCKED: true},
-);
-const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED = utils.createMockStep(
-    'Check if StagingDeployCash is locked',
-    'Checking StagingDeployCash',
-    'CHOOSE_DEPLOY_ACTIONS',
-    ['GITHUB_TOKEN'],
-    null,
-    {IS_LOCKED: false},
-);
-const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED = [
-    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
-    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED,
-
-    // step 3 runs normally
-];
-const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED = [
-    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
-    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED,
-
-    // step 3 runs normally
-];
-
-// skip_deploy
-const COMMENT_ON_DEFERRED_PR_MOCK_STEP = utils.createMockStep('Comment on deferred PR', 'Skipping deploy', 'SKIP_DEPLOY', ['github_token', 'number', 'body']);
-const SKIP_DEPLOY_JOB_MOCK_STEPS = [COMMENT_ON_DEFERRED_PR_MOCK_STEP];
-
-// create_new_version
-const CREATE_NEW_VERSION_MOCK_STEP = utils.createMockStep(
-    'Create new version',
-    'Creating new version',
-    'CREATE_NEW_VERSION',
-    null,
-    null,
-    {NEW_VERSION: '1.2.3'},
-    null,
-    true,
-    'createNewVersion',
-);
-const CREATE_NEW_VERSION_JOB_MOCK_STEPS = [CREATE_NEW_VERSION_MOCK_STEP];
-
-// update_staging
-const RUN_TURNSTYLE_MOCK_STEP = utils.createMockStep('Run turnstyle', 'Running turnstyle', 'UPDATE_STAGING', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
-const CHECKOUT_MAIN_MOCK_STEP = utils.createMockStep('Checkout main', 'Checkout main', 'UPDATE_STAGING', ['ref', 'token']);
-const SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP = utils.createMockStep('Setup Git for OSBotify', 'Setup Git for OSBotify', 'UPDATE_STAGING', ['GPG_PASSPHRASE']);
-const UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP = utils.createMockStep('Update staging branch from main', 'Update staging branch from main', 'UPDATE_STAGING');
-const ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in Slack', 'UPDATE_STAGING', ['SLACK_WEBHOOK']);
-const UPDATE_STAGING_JOB_MOCK_STEPS = [
-    RUN_TURNSTYLE_MOCK_STEP,
-    CHECKOUT_MAIN_MOCK_STEP,
-    SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP,
-    UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP,
-    ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP,
-];
-
-const PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP = utils.createMockStep('Perform E2E tests', 'Perform E2E tests', 'E2EPERFORMANCETESTS');
-const PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS = [PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP];
-
-module.exports = {
-    TYPECHECK_JOB_MOCK_STEPS,
-    LINT_JOB_MOCK_STEPS,
-    TEST_JOB_MOCK_STEPS,
-    CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
-    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
-    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
-    SKIP_DEPLOY_JOB_MOCK_STEPS,
-    CREATE_NEW_VERSION_JOB_MOCK_STEPS,
-    UPDATE_STAGING_JOB_MOCK_STEPS,
-    PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
-};
diff --git a/workflow_tests/mocks/preDeployMocks.ts b/workflow_tests/mocks/preDeployMocks.ts
new file mode 100644
index 000000000000..df6bc63e7dd9
--- /dev/null
+++ b/workflow_tests/mocks/preDeployMocks.ts
@@ -0,0 +1,94 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// typecheck
+const TYPECHECK_WORKFLOW_MOCK_STEP = createMockStep('Run typecheck workflow', 'Running typecheck workflow', 'TYPECHECK');
+const TYPECHECK_JOB_MOCK_STEPS = [TYPECHECK_WORKFLOW_MOCK_STEP] as const;
+
+// lint
+const LINT_WORKFLOW_MOCK_STEP = createMockStep('Run lint workflow', 'Running lint workflow', 'LINT');
+const LINT_JOB_MOCK_STEPS = [LINT_WORKFLOW_MOCK_STEP] as const;
+
+// test
+const TEST_WORKFLOW_MOCK_STEP = createMockStep('Run test workflow', 'Running test workflow', 'TEST');
+const TEST_JOB_MOCK_STEPS = [TEST_WORKFLOW_MOCK_STEP] as const;
+
+// confirm_passing_build
+const ANNOUNCE_IN_SLACK_MOCK_STEP = createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in slack', 'CONFIRM_PASSING_BUILD', ['SLACK_WEBHOOK']);
+const CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS = [
+    ANNOUNCE_IN_SLACK_MOCK_STEP,
+
+    // 2nd step runs normally
+] as const;
+
+// choose_deploy_actions
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY = createMockStep('Get merged pull request', 'Getting merged pull request', 'CHOOSE_DEPLOY_ACTIONS', ['github_token'], null, {
+    number: '123',
+    labels: '[]',
+});
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED = createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: true},
+);
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED = createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: false},
+);
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED,
+
+    // step 3 runs normally
+] as const;
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED,
+
+    // step 3 runs normally
+] as const;
+
+// skip_deploy
+const COMMENT_ON_DEFERRED_PR_MOCK_STEP = createMockStep('Comment on deferred PR', 'Skipping deploy', 'SKIP_DEPLOY', ['github_token', 'number', 'body']);
+const SKIP_DEPLOY_JOB_MOCK_STEPS = [COMMENT_ON_DEFERRED_PR_MOCK_STEP] as const;
+
+// create_new_version
+const CREATE_NEW_VERSION_MOCK_STEP = createMockStep('Create new version', 'Creating new version', 'CREATE_NEW_VERSION', null, null, {NEW_VERSION: '1.2.3'}, null, true, 'createNewVersion');
+const CREATE_NEW_VERSION_JOB_MOCK_STEPS = [CREATE_NEW_VERSION_MOCK_STEP] as const;
+
+// update_staging
+const RUN_TURNSTYLE_MOCK_STEP = createMockStep('Run turnstyle', 'Running turnstyle', 'UPDATE_STAGING', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CHECKOUT_MAIN_MOCK_STEP = createMockStep('Checkout main', 'Checkout main', 'UPDATE_STAGING', ['ref', 'token']);
+const SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP = createMockStep('Setup Git for OSBotify', 'Setup Git for OSBotify', 'UPDATE_STAGING', ['GPG_PASSPHRASE']);
+const UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP = createMockStep('Update staging branch from main', 'Update staging branch from main', 'UPDATE_STAGING');
+const ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP = createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in Slack', 'UPDATE_STAGING', ['SLACK_WEBHOOK']);
+const UPDATE_STAGING_JOB_MOCK_STEPS = [
+    RUN_TURNSTYLE_MOCK_STEP,
+    CHECKOUT_MAIN_MOCK_STEP,
+    SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP,
+    UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP,
+    ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP,
+] as const;
+
+const PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP = createMockStep('Perform E2E tests', 'Perform E2E tests', 'E2EPERFORMANCETESTS');
+const PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS = [PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP] as const;
+
+export {
+    TYPECHECK_JOB_MOCK_STEPS,
+    LINT_JOB_MOCK_STEPS,
+    TEST_JOB_MOCK_STEPS,
+    CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+    SKIP_DEPLOY_JOB_MOCK_STEPS,
+    CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+    UPDATE_STAGING_JOB_MOCK_STEPS,
+    PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+};
diff --git a/workflow_tests/mocks/reviewerChecklistMocks.js b/workflow_tests/mocks/reviewerChecklistMocks.js
deleted file mode 100644
index 5f9ef67198a8..000000000000
--- a/workflow_tests/mocks/reviewerChecklistMocks.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const utils = require('../utils/utils');
-
-// checklist
-const REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK = utils.createMockStep('reviewerChecklist.js', 'reviewerChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
-const REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS = [REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK];
-
-module.exports = {
-    REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/reviewerChecklistMocks.ts b/workflow_tests/mocks/reviewerChecklistMocks.ts
new file mode 100644
index 000000000000..20c87994f957
--- /dev/null
+++ b/workflow_tests/mocks/reviewerChecklistMocks.ts
@@ -0,0 +1,11 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// checklist
+const REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK = createMockStep('reviewerChecklist.js', 'reviewerChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS = [REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/testBuildMocks.js b/workflow_tests/mocks/testBuildMocks.ts
similarity index 59%
rename from workflow_tests/mocks/testBuildMocks.js
rename to workflow_tests/mocks/testBuildMocks.ts
index 37bcc5fb6fac..12109d0a875b 100644
--- a/workflow_tests/mocks/testBuildMocks.js
+++ b/workflow_tests/mocks/testBuildMocks.ts
@@ -1,13 +1,14 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // validateactor
-const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK = createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
     IS_EXPENSIFY_EMPLOYEE: true,
 });
-const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK = createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
     IS_EXPENSIFY_EMPLOYEE: false,
 });
-const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK = createMockStep(
     'Set HAS_READY_TO_BUILD_LABEL flag',
     'Set HAS_READY_TO_BUILD_LABEL flag',
     'VALIDATEACTOR',
@@ -15,7 +16,7 @@ const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MO
     ['PULL_REQUEST_NUMBER', 'GITHUB_TOKEN'],
     {HAS_READY_TO_BUILD_LABEL: true},
 );
-const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK = createMockStep(
     'Set HAS_READY_TO_BUILD_LABEL flag',
     'Set HAS_READY_TO_BUILD_LABEL flag',
     'VALIDATEACTOR',
@@ -26,23 +27,23 @@ const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_M
 const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
     TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
     TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
-];
+] as const;
 const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
     TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
     TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
-];
+] as const;
 const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
     TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
     TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
-];
+] as const;
 const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
     TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
     TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
-];
+] as const;
 
 // getbranchref
-const TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'GETBRANCHREF', [], []);
-const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'GETBRANCHREF', [], []);
+const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK = createMockStep(
     'Check if pull request number is correct',
     'Check if pull request number is correct',
     'GETBRANCHREF',
@@ -50,38 +51,38 @@ const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOC
     ['GITHUB_TOKEN'],
     {REF: 'test-ref'},
 );
-const TESTBUILD__GETBRANCHREF__STEP_MOCKS = [TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK, TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK];
+const TESTBUILD__GETBRANCHREF__STEP_MOCKS = [TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK, TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK] as const;
 
 // android
-const TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'ANDROID', ['ref'], []);
-const TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'ANDROID', ['ref'], []);
+const TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
     'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
     'Creating .env.adhoc file based on staging',
     'ANDROID',
     [],
     [],
 );
-const TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'ANDROID', [], []);
-const TESTBUILD__ANDROID__SETUP_JAVA__STEP_MOCK = utils.createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
-const TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'ANDROID', ['ruby-version', 'bundler-cache'], []);
-const TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypt json key', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'ANDROID', [], []);
+const TESTBUILD__ANDROID__SETUP_JAVA__STEP_MOCK = createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
+const TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setup Ruby', 'ANDROID', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = createMockStep('Decrypt json key', 'Decrypt json key', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
     'Configure AWS Credentials',
     'Configure AWS Credentials',
     'ANDROID',
     ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
     [],
 );
-const TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
-const TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK = createMockStep(
     'Run Fastlane beta test',
     'Run Fastlane beta test',
     'ANDROID',
     [],
     ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION', 'MYAPP_UPLOAD_STORE_PASSWORD', 'MYAPP_UPLOAD_KEY_PASSWORD'],
 );
-const TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'ANDROID', ['name', 'path'], []);
+const TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK = createMockStep('Upload Artifact', 'Upload Artifact', 'ANDROID', ['name', 'path'], []);
 const TESTBUILD__ANDROID__STEP_MOCKS = [
     TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK,
     TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK,
@@ -94,46 +95,46 @@ const TESTBUILD__ANDROID__STEP_MOCKS = [
     TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
     TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK,
     TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK,
-];
+] as const;
 
 // ios
-const TESTBUILD__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'IOS', ['ref'], []);
-const TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
-const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__IOS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'IOS', ['ref'], []);
+const TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
     'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
     'Creating .env.adhoc file based on staging',
     'IOS',
     [],
     [],
 );
-const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'IOS', [], []);
-const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = utils.createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []);
-const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []);
-const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
     'cache-hit': false,
 });
-const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
+const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
     IS_PODFILE_SAME_AS_MANIFEST: false,
 });
-const TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], []);
-const TESTBUILD__IOS__DECRYPT_ADHOC_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt AdHoc profile', 'Decrypt AdHoc profile', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__IOS__DECRYPT_ADHOC_NSE_PROFILE__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK = createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], []);
+const TESTBUILD__IOS__DECRYPT_ADHOC_PROFILE__STEP_MOCK = createMockStep('Decrypt AdHoc profile', 'Decrypt AdHoc profile', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__DECRYPT_ADHOC_NSE_PROFILE__STEP_MOCK = createMockStep(
     'Decrypt AdHoc Notification Service profile',
     'Decrypt AdHoc Notification Service profile',
     'IOS',
     [],
     ['LARGE_SECRET_PASSPHRASE'],
 );
-const TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypt certificate', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = createMockStep('Decrypt certificate', 'Decrypt certificate', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
     'Configure AWS Credentials',
     'Configure AWS Credentials',
     'IOS',
     ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
     [],
 );
-const TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Run Fastlane', 'IOS', [], ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION']);
-const TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'IOS', ['name', 'path'], []);
+const TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK = createMockStep('Run Fastlane', 'Run Fastlane', 'IOS', [], ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION']);
+const TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK = createMockStep('Upload Artifact', 'Upload Artifact', 'IOS', ['name', 'path'], []);
 const TESTBUILD__IOS__STEP_MOCKS = [
     TESTBUILD__IOS__CHECKOUT__STEP_MOCK,
     TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
@@ -150,33 +151,33 @@ const TESTBUILD__IOS__STEP_MOCKS = [
     TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
     TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK,
     TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK,
-];
+] as const;
 
 // desktop
-const TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DESKTOP', ['ref'], []);
-const TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'DESKTOP', ['ref'], []);
+const TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
     'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
     'Creating .env.adhoc file based on staging',
     'DESKTOP',
     [],
     [],
 );
-const TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'DESKTOP', [], []);
-const TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'DESKTOP', [], []);
+const TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK = createMockStep(
     'Decrypt Developer ID Certificate',
     'Decrypt Developer ID Certificate',
     'DESKTOP',
     [],
     ['DEVELOPER_ID_SECRET_PASSPHRASE'],
 );
-const TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
     'Configure AWS Credentials',
     'Configure AWS Credentials',
     'DESKTOP',
     ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
     [],
 );
-const TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK = createMockStep(
     'Build desktop app for testing',
     'Build desktop app for testing',
     'DESKTOP',
@@ -190,28 +191,28 @@ const TESTBUILD__DESKTOP__STEP_MOCKS = [
     TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK,
     TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
     TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK,
-];
+] as const;
 
 // web
-const TESTBUILD__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'WEB', ['ref'], []);
-const TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__WEB__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'WEB', ['ref'], []);
+const TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
     'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
     'Creating .env.adhoc file based on staging',
     'WEB',
     [],
     [],
 );
-const TESTBUILD__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'WEB', [], []);
-const TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__WEB__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'WEB', [], []);
+const TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
     'Configure AWS Credentials',
     'Configure AWS Credentials',
     'WEB',
     ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
     [],
 );
-const TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK = utils.createMockStep('Build web for testing', 'Build web for testing', 'WEB', [], []);
-const TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK = utils.createMockStep('Build docs', 'Build docs', 'WEB', [], []);
-const TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK = utils.createMockStep('Deploy to S3 for internal testing', 'Deploy to S3 for internal testing', 'WEB', [], []);
+const TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK = createMockStep('Build web for testing', 'Build web for testing', 'WEB', [], []);
+const TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK = createMockStep('Build docs', 'Build docs', 'WEB', [], []);
+const TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK = createMockStep('Deploy to S3 for internal testing', 'Deploy to S3 for internal testing', 'WEB', [], []);
 const TESTBUILD__WEB__STEP_MOCKS = [
     TESTBUILD__WEB__CHECKOUT__STEP_MOCK,
     TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK,
@@ -220,23 +221,18 @@ const TESTBUILD__WEB__STEP_MOCKS = [
     TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK,
     TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK,
     TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK,
-];
+] as const;
 
 // postgithubcomment
-const TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'POSTGITHUBCOMMENT', ['ref'], []);
-const TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Download Artifact', 'Download Artifact', 'POSTGITHUBCOMMENT', [], []);
-const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK = utils.createMockStep(
-    'Read JSONs with android paths',
-    'Read JSONs with android paths',
-    'POSTGITHUBCOMMENT',
-    [],
-    [],
-    {android_path: 'http://dummy.android.link'},
-);
-const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK = utils.createMockStep('Read JSONs with iOS paths', 'Read JSONs with iOS paths', 'POSTGITHUBCOMMENT', [], [], {
+const TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'POSTGITHUBCOMMENT', ['ref'], []);
+const TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK = createMockStep('Download Artifact', 'Download Artifact', 'POSTGITHUBCOMMENT', [], []);
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK = createMockStep('Read JSONs with android paths', 'Read JSONs with android paths', 'POSTGITHUBCOMMENT', [], [], {
+    android_path: 'http://dummy.android.link',
+});
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK = createMockStep('Read JSONs with iOS paths', 'Read JSONs with iOS paths', 'POSTGITHUBCOMMENT', [], [], {
     ios_path: 'http://dummy.ios.link',
 });
-const TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK = utils.createMockStep(
+const TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK = createMockStep(
     'Publish links to apps for download',
     'Publish links to apps for download',
     'POSTGITHUBCOMMENT',
@@ -249,9 +245,9 @@ const TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS = [
     TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK,
     TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK,
     TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK,
-];
+] as const;
 
-module.exports = {
+export {
     TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
     TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
     TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
diff --git a/workflow_tests/mocks/testMocks.js b/workflow_tests/mocks/testMocks.js
deleted file mode 100644
index 19011271bb47..000000000000
--- a/workflow_tests/mocks/testMocks.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const utils = require('../utils/utils');
-
-// jest
-const TEST__JEST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'JEST', [], []);
-const TEST__JEST__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'JEST', [], []);
-const TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK = utils.createMockStep('Get number of CPU cores', 'Get number of CPU cores', 'JEST', [], [], {count: 8});
-const TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK = utils.createMockStep('Cache Jest cache', 'Cache Jest cache', 'JEST', ['path', 'key'], []);
-const TEST__JEST__JEST_TESTS__STEP_MOCK = utils.createMockStep('Jest tests', 'Jest tests', 'JEST', [], []);
-const TEST__JEST__STEP_MOCKS = [
-    TEST__JEST__CHECKOUT__STEP_MOCK,
-    TEST__JEST__SETUP_NODE__STEP_MOCK,
-    TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK,
-    TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK,
-    TEST__JEST__JEST_TESTS__STEP_MOCK,
-];
-
-// shelltests
-const TEST__SHELLTESTS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK = utils.createMockStep('Test CI git logic', 'Test CI git logic', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__STEP_MOCKS = [TEST__SHELLTESTS__CHECKOUT__STEP_MOCK, TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK, TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK];
-
-module.exports = {
-    TEST__JEST__STEP_MOCKS,
-    TEST__SHELLTESTS__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/testMocks.ts b/workflow_tests/mocks/testMocks.ts
new file mode 100644
index 000000000000..96f47d4204fb
--- /dev/null
+++ b/workflow_tests/mocks/testMocks.ts
@@ -0,0 +1,24 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// jest
+const TEST__JEST__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'JEST', [], []);
+const TEST__JEST__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'JEST', [], []);
+const TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK = createMockStep('Get number of CPU cores', 'Get number of CPU cores', 'JEST', [], [], {count: 8});
+const TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK = createMockStep('Cache Jest cache', 'Cache Jest cache', 'JEST', ['path', 'key'], []);
+const TEST__JEST__JEST_TESTS__STEP_MOCK = createMockStep('Jest tests', 'Jest tests', 'JEST', [], []);
+const TEST__JEST__STEP_MOCKS = [
+    TEST__JEST__CHECKOUT__STEP_MOCK,
+    TEST__JEST__SETUP_NODE__STEP_MOCK,
+    TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK,
+    TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK,
+    TEST__JEST__JEST_TESTS__STEP_MOCK,
+] as const;
+
+// shelltests
+const TEST__SHELLTESTS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK = createMockStep('Test CI git logic', 'Test CI git logic', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__STEP_MOCKS = [TEST__SHELLTESTS__CHECKOUT__STEP_MOCK, TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK, TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK] as const;
+
+export {TEST__JEST__STEP_MOCKS, TEST__SHELLTESTS__STEP_MOCKS};
diff --git a/workflow_tests/mocks/validateGithubActionsMocks.js b/workflow_tests/mocks/validateGithubActionsMocks.js
deleted file mode 100644
index e2d48932acf6..000000000000
--- a/workflow_tests/mocks/validateGithubActionsMocks.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const utils = require('../utils/utils');
-
-// verify
-const VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
-const VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
-const VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK = utils.createMockStep(
-    'Verify Javascript Action Builds',
-    'Verify Javascript Action Builds',
-    'VERIFY',
-    [],
-    [],
-);
-const VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK = utils.createMockStep('Validate actions and workflows', 'Validate actions and workflows', 'VERIFY', [], []);
-const VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS = [
-    VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK,
-];
-
-module.exports = {
-    VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/validateGithubActionsMocks.ts b/workflow_tests/mocks/validateGithubActionsMocks.ts
new file mode 100644
index 000000000000..8249945dbfc7
--- /dev/null
+++ b/workflow_tests/mocks/validateGithubActionsMocks.ts
@@ -0,0 +1,19 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// verify
+const VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK = createMockStep('Verify Javascript Action Builds', 'Verify Javascript Action Builds', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK = createMockStep('Validate actions and workflows', 'Validate actions and workflows', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS = [
+    VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK,
+] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifyPodfileMocks.js b/workflow_tests/mocks/verifyPodfileMocks.js
deleted file mode 100644
index 0a82eebcc748..000000000000
--- a/workflow_tests/mocks/verifyPodfileMocks.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const utils = require('../utils/utils');
-
-// verify
-const VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
-const VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
-const VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK = utils.createMockStep('Verify podfile', 'Verify podfile', 'VERIFY', [], []);
-const VERIFYPODFILE__VERIFY__STEP_MOCKS = [VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK, VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK, VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK];
-
-module.exports = {
-    VERIFYPODFILE__VERIFY__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/verifyPodfileMocks.ts b/workflow_tests/mocks/verifyPodfileMocks.ts
new file mode 100644
index 000000000000..b1f0669b8b00
--- /dev/null
+++ b/workflow_tests/mocks/verifyPodfileMocks.ts
@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
+
+// verify
+const VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK = createMockStep('Verify podfile', 'Verify podfile', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__STEP_MOCKS = [
+    VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK,
+    VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK,
+    VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK,
+] as const;
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    VERIFYPODFILE__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifySignedCommitsMocks.js b/workflow_tests/mocks/verifySignedCommitsMocks.ts
similarity index 63%
rename from workflow_tests/mocks/verifySignedCommitsMocks.js
rename to workflow_tests/mocks/verifySignedCommitsMocks.ts
index a19fac809e55..953d09d1255f 100644
--- a/workflow_tests/mocks/verifySignedCommitsMocks.js
+++ b/workflow_tests/mocks/verifySignedCommitsMocks.ts
@@ -1,15 +1,17 @@
-const utils = require('../utils/utils');
+/* eslint-disable @typescript-eslint/naming-convention */
+import {createMockStep} from '../utils/utils';
 
 // verifysignedcommits
-const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK = utils.createMockStep(
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK = createMockStep(
     'Verify signed commits',
     'Verify signed commits',
     'VERIFYSIGNEDCOMMITS',
     ['GITHUB_TOKEN'],
     [],
 );
-const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS = [VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK];
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS = [VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK] as const;
 
-module.exports = {
+export {
+    // eslint-disable-next-line import/prefer-default-export
     VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
 };
diff --git a/workflow_tests/utils/utils.ts b/workflow_tests/utils/utils.ts
index dcc04aee02de..df4cc0468963 100644
--- a/workflow_tests/utils/utils.ts
+++ b/workflow_tests/utils/utils.ts
@@ -69,7 +69,7 @@ function createMockStep(
     jobId: string | null = null,
     inputs: string[] | null = null,
     inEnvs: string[] | null = null,
-    outputs: Record<string, string> | null = null,
+    outputs: Record<string, string | boolean | number> | null = null,
     outEnvs: Record<string, string> | null = null,
     isSuccessful = true,
     id: string | null = null,