diff --git a/.eslintrc.js b/.eslintrc.js
index 22b94d79e369..ac4546567833 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -164,7 +164,7 @@ module.exports = {
             },
         },
         {
-            files: ['tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
+            files: ['workflow_tests/**/*.{js,jsx,ts,tsx}', 'tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
             rules: {
                 '@lwc/lwc/no-async-await': 'off',
                 'no-await-in-loop': 'off',
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index 494326869cca..b6558b049647 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -13,7 +13,8 @@ jobs:
     outputs:
       IS_DEPLOYER: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
     steps:
-      - id: isDeployer
+      - name: Check if user is deployer
+        id: isDeployer
         run: |
           if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
             echo "IS_DEPLOYER=true" >> "$GITHUB_OUTPUT"
@@ -39,7 +40,8 @@ jobs:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Set up git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 8943669c2ba8..54ae1048b57b 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -13,18 +13,20 @@ jobs:
     # It does not run for pull requests created by OSBotify
     if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify') }}
     steps:
-        - uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
+        - name: CLA comment check
+          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
           id: sign
           with:
             text: ${{ github.event.comment.body }}
             regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
+        - name: CLA comment re-check
+          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
           id: recheck
           with:
             text: ${{ github.event.comment.body }}
             regex: '\s*recheck\s*'
         - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' }} || github.event_name == 'pull_request_target'
+          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
           # Version: 2.1.2-beta
           uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
           env:
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index b2703731df79..ba907334c595 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -54,18 +54,21 @@ jobs:
       NEW_VERSION: ${{ steps.bumpVersion.outputs.NEW_VERSION }}
 
     steps:
-      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+      - name: Run turnstyle
+        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - uses: actions/checkout@v3
+      - name: Check out
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -89,7 +92,8 @@ jobs:
       - name: Update main branch
         run: git push origin main
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b3105ee05c2c..f2ff67680940 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,8 @@ jobs:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -29,12 +30,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/production'
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: production
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml
index 8065a5c88cb2..f42d19ca8241 100644
--- a/.github/workflows/deployBlocker.yml
+++ b/.github/workflows/deployBlocker.yml
@@ -11,7 +11,8 @@ jobs:
     if: ${{ github.event.label.name == 'DeployBlockerCash' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -63,7 +64,8 @@ jobs:
               2. Find someone who can quickly fix the issue.
               3. Fix the issue yourself.
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
index 7b71f6263c88..e2323af2486e 100644
--- a/.github/workflows/finishReleaseCycle.yml
+++ b/.github/workflows/finishReleaseCycle.yml
@@ -23,7 +23,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - name: Reopen and comment on issue
+      - name: Reopen and comment on issue (not a team member)
         if: ${{ !fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
@@ -41,8 +41,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
-      - name: Reopen and comment on issue
-        if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS) }}
+      - name: Reopen and comment on issue (has blockers)
+        if: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS || 'false') }}
         uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -51,7 +51,8 @@ jobs:
             This issue either has unchecked items or has not yet been marked with the `:shipit:` emoji of approval.
             Reopening!
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -62,12 +63,14 @@ jobs:
     needs: validate
     if: ${{ fromJSON(needs.validate.outputs.isValid) }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -79,7 +82,8 @@ jobs:
           # Force-update the remote production branch.
           git push --force origin production
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -98,12 +102,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: [updateProduction, createNewPatchVersion]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -115,7 +121,8 @@ jobs:
           # Force-update the remote staging branch
           git push --force origin staging
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1983e406c77b..5953a4aa89e2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,9 +11,11 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Lint JavaScript and Typescript with ESLint
         run: npm run lint
diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml
index a49a5519f690..6ca025bb2a25 100644
--- a/.github/workflows/lockDeploys.yml
+++ b/.github/workflows/lockDeploys.yml
@@ -9,7 +9,8 @@ jobs:
     if: ${{ github.event.label.name == '🔐 LockCashDeploys 🔐' && contains(github.event.issue.labels.*.name, 'StagingDeployCash') && github.actor != 'OSBotify' }}
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -27,7 +28,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index cd65b8451636..ad002e164837 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -18,7 +18,8 @@ jobs:
     outputs:
       IS_DEPLOYER: ${{ fromJSON(steps.isUserDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
     steps:
-      - id: isUserDeployer
+      - name: Check if user is deployer
+        id: isUserDeployer
         run: |
           if gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
             echo "IS_DEPLOYER=true" >> "$GITHUB_OUTPUT"
@@ -35,8 +36,10 @@ jobs:
     if: ${{ github.event_name != 'release' }}
     needs: validateActor
     steps:
-      - uses: actions/checkout@v3
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Set version
         id: getVersion
@@ -54,14 +57,17 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -128,9 +134,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
         run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg
@@ -165,14 +173,17 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -267,9 +278,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Cloudflare CLI
         run: pip3 install cloudflare
@@ -324,7 +337,8 @@ jobs:
     if: ${{ failure() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
+      - name: Post Slack message on failure
+        uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
@@ -334,7 +348,8 @@ jobs:
     if: ${{ success() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
@@ -394,9 +409,11 @@ jobs:
     if: ${{ always() }}
     needs: [android, desktop, iOS, web]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
index e3977734fc50..186490c7baaf 100644
--- a/.github/workflows/preDeploy.yml
+++ b/.github/workflows/preDeploy.yml
@@ -2,7 +2,8 @@ name: Process new code merged to main
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   typecheck:
@@ -20,12 +21,14 @@ jobs:
     if: ${{ always() }}
 
     steps:
-      - if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+      - name: Announce failed workflow in Slack
+        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
-      - if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+      - name: Exit failed workflow
+        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
         run: exit 1
 
   chooseDeployActions:
@@ -33,7 +36,7 @@ jobs:
     needs: confirmPassingBuild
     outputs:
       MERGED_PR: ${{ steps.getMergedPullRequest.outputs.number }}
-      SHOULD_DEPLOY: ${{ steps.shouldDeploy.outputs.SHOULD_DEPLOY }}
+      SHOULD_DEPLOY: ${{ fromJSON(steps.shouldDeploy.outputs.SHOULD_DEPLOY) }}
 
     steps:
       - name: Get merged pull request
@@ -75,18 +78,21 @@ jobs:
     needs: [chooseDeployActions, createNewVersion]
     runs-on: ubuntu-latest
     steps:
-      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+      - name: Run turnstyle
+        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - uses: actions/checkout@v3
+      - name: Checkout main
+        uses: actions/checkout@v3
         with:
           ref: main
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+      - name: Setup Git for OSBotify
+        uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
@@ -98,7 +104,8 @@ jobs:
           # Force-update the remote staging branch
           git push --force origin staging
 
-      - if: ${{ failure() }}
+      - name: Announce failed workflow in Slack
+        if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -134,7 +141,8 @@ jobs:
     if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }}
     steps:
       # Version: 2.3.4
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e79a02281ae0..72bdd0468fd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,11 @@ jobs:
         chunk: [ 1, 2, 3 ]
     name: test (job ${{ fromJSON(matrix.chunk) }})
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Get number of CPU cores
         id: cpu-cores
@@ -53,9 +55,11 @@ jobs:
     runs-on: ubuntu-latest
     name: Shell tests
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Test CI git logic
         run: tests/unit/CIGitLogicTest.sh
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index fd8118895679..755ab6dbaa60 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -19,7 +19,8 @@ jobs:
     outputs:
       READY_TO_BUILD: ${{ fromJSON(steps.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && fromJSON(steps.hasReadyToBuildLabel.outputs.HAS_READY_TO_BUILD_LABEL) }}
     steps:
-      - id: isExpensifyEmployee
+      - name: Is Expensify employee
+        id: isExpensifyEmployee
         run: |
           if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ github.actor }} --silent; then
             echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
@@ -70,7 +71,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -80,9 +82,11 @@ jobs:
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -117,7 +121,8 @@ jobs:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
         with:
           name: android
           path: ./android_paths.json
@@ -131,7 +136,8 @@ jobs:
     runs-on: macos-12-xl
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -144,12 +150,14 @@ jobs:
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - name: Setup Xcode
+      - name: Setup XCode
         run: sudo xcode-select -switch /Applications/Xcode_14.2.app
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -198,7 +206,8 @@ jobs:
           S3_BUCKET: ad-hoc-expensify-cash
           S3_REGION: us-east-1
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
         with:
           name: ios
           path: ./ios_paths.json
@@ -211,7 +220,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     runs-on: macos-12-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -221,7 +231,8 @@ jobs:
           sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
         run: cd desktop && gpg --quiet --batch --yes --decrypt --passphrase="$DEVELOPER_ID_SECRET_PASSPHRASE" --output developer_id.p12 developer_id.p12.gpg
@@ -252,7 +263,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -262,7 +274,8 @@ jobs:
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Configure AWS Credentials
         uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main
@@ -283,7 +296,7 @@ jobs:
   postGithubComment:
     runs-on: ubuntu-latest
     name: Post a GitHub comment with app download links for testing
-    needs: [validateActor, getBranchRef, android, ios, desktop, web]
+    needs: [validateActor, getBranchRef, android, iOS, desktop, web]
     if: ${{ always() }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
@@ -294,7 +307,8 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
-      - uses: actions/download-artifact@v3
+      - name: Download Artifact
+        uses: actions/download-artifact@v3
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
 
       - name: Read JSONs with android paths
@@ -310,7 +324,7 @@ jobs:
 
       - name: Read JSONs with iOS paths
         id: get_ios_path
-        if: ${{ needs.ios.result == 'success' }}
+        if: ${{ needs.iOS.result == 'success' }}
         run: |
           content_ios="$(cat ./ios/ios_paths.json)"
           content_ios="${content_ios//'%'/'%25'}"
@@ -340,6 +354,6 @@ jobs:
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
-          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
+          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensifyAdHoc.dmg
           IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
diff --git a/.github/workflows/validateGithubActions.yml b/.github/workflows/validateGithubActions.yml
index f496c5e4b27e..bcda941e1b05 100644
--- a/.github/workflows/validateGithubActions.yml
+++ b/.github/workflows/validateGithubActions.yml
@@ -12,9 +12,11 @@ jobs:
     if: github.actor != 'OSBotify'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
       # Rebuild all the actions on this branch and check for a diff. Fail if there is one,
       # because that would be a sign that the PR author did not rebuild the Github Actions
diff --git a/.github/workflows/verifyPodfile.yml b/.github/workflows/verifyPodfile.yml
index 64188769f0bd..d8d931e476d1 100644
--- a/.github/workflows/verifyPodfile.yml
+++ b/.github/workflows/verifyPodfile.yml
@@ -14,8 +14,9 @@ jobs:
     if: github.actor != 'OSBotify'
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
-
-      - run: ./.github/scripts/verifyPodfile.sh
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Verify podfile
+        run: ./.github/scripts/verifyPodfile.sh
diff --git a/.github/workflows/verifySignedCommits.yml b/.github/workflows/verifySignedCommits.yml
index e1068e71e041..ee1b0c4c78da 100644
--- a/.github/workflows/verifySignedCommits.yml
+++ b/.github/workflows/verifySignedCommits.yml
@@ -9,6 +9,7 @@ jobs:
   verifySignedCommits:
     runs-on: ubuntu-latest
     steps:
-      - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main
+      - name: Verify signed commits
+        uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main
         with:
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
index 4919ddc1fdc9..aae9baad529f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,9 @@ tests/e2e/results/
 
 # Typescript
 tsconfig.tsbuildinfo
+
+# Mock-github
+/repo/
+
+# Workflow test logs
+/workflow_tests/logs/
diff --git a/.storybook/theme.js b/.storybook/theme.js
index 0867f6a830b5..96631764726f 100644
--- a/.storybook/theme.js
+++ b/.storybook/theme.js
@@ -7,17 +7,17 @@ export default create({
     fontBase: 'ExpensifyNeue-Regular',
     fontCode: 'monospace',
     base: 'dark',
-    appBg: colors.greenHighlightBackground,
-    colorPrimary: colors.greenDefaultButton,
+    appBg: colors.darkHighlightBackground,
+    colorPrimary: colors.darkDefaultButton,
     colorSecondary: colors.green,
-    appContentBg: colors.greenAppBackground,
-    textColor: colors.white,
-    barTextColor: colors.white,
+    appContentBg: colors.darkAppBackground,
+    textColor: colors.darkPrimaryText,
+    barTextColor: colors.darkPrimaryText,
     barSelectedColor: colors.green,
-    barBg: colors.greenAppBackground,
-    appBorderColor: colors.greenBorders,
-    inputBg: colors.greenHighlightBackground,
-    inputBorder: colors.greenBorders,
+    barBg: colors.darkAppBackground,
+    appBorderColor: colors.darkBorders,
+    inputBg: colors.darkHighlightBackground,
+    inputBorder: colors.darkBorders,
     appBorderRadius: 8,
     inputBorderRadius: 8,
 });
diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index 9274dd8c1382..c871764117ed 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -63,6 +63,14 @@
                     {
                         "/": "/new/*",
                         "comment": "New Chat"
+                    },
+                    {
+                        "/": "/workspace/*",
+                        "comment": "Workspace Details"
+                    },
+                    {
+                        "/": "/teachersunite/*",
+                        "comment": "Teachers Unite!"
                     }
                 ]
             }
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 98f7cbfa495c..9986b297a437 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,7 +22,7 @@ react {
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    debuggableVariants = ["developmentDebug"]
+    debuggableVariants = ["developmentDebug", "productionDebug"]
 
     /* Bundling */
     //   A list containing the node command and its flags. Default is just 'node'.
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036812
-        versionName "1.3.68-12"
+        versionCode 1001037003
+        versionName "1.3.70-3"
     }
 
     flavorDimensions "default"
diff --git a/android/app/src/development/assets/airshipconfig.properties b/android/app/src/development/assets/airshipconfig.properties
index 490f74552f11..43907fcbf251 100644
--- a/android/app/src/development/assets/airshipconfig.properties
+++ b/android/app/src/development/assets/airshipconfig.properties
@@ -5,4 +5,4 @@ developmentLogLevel = VERBOSE
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #2EAAE2
\ No newline at end of file
+notificationAccentColor = #03D47C
\ No newline at end of file
diff --git a/android/app/src/main/assets/airshipconfig.properties b/android/app/src/main/assets/airshipconfig.properties
index 194c4577de8b..e15533fdda4d 100644
--- a/android/app/src/main/assets/airshipconfig.properties
+++ b/android/app/src/main/assets/airshipconfig.properties
@@ -4,4 +4,4 @@ inProduction = true
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #2EAAE2
\ No newline at end of file
+notificationAccentColor = #03D47C
\ No newline at end of file
diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
index da87c93ee367..a5478dbd8f78 100644
--- a/config/electronBuilder.config.js
+++ b/config/electronBuilder.config.js
@@ -21,6 +21,24 @@ const macIcon = {
     adhoc: './desktop/icon-adhoc.png',
 };
 
+const appIds = {
+    production: 'com.expensifyreactnative.chat',
+    staging: 'com.expensifyreactnative.dev.chat',
+    adhoc: 'com.expensifyreactnative.adhoc.chat',
+};
+
+const productNames = {
+    production: 'New Expensify',
+    staging: 'New Expensify Dev',
+    adhoc: 'New Expensify AdHoc',
+};
+
+const artifactNames = {
+    production: 'NewExpensify.dmg',
+    staging: 'NewExpensifyDev.dmg',
+    adhoc: 'NewExpensifyAdHoc.dmg',
+};
+
 const isCorrectElectronEnv = ['production', 'staging', 'adhoc'].includes(process.env.ELECTRON_ENV);
 
 if (!isCorrectElectronEnv) {
@@ -32,8 +50,8 @@ if (!isCorrectElectronEnv) {
  * It can be used to create local builds of the same, by omitting the `--publish` flag
  */
 module.exports = {
-    appId: 'com.expensifyreactnative.chat',
-    productName: 'New Expensify',
+    appId: appIds[process.env.ELECTRON_ENV],
+    productName: productNames[process.env.ELECTRON_ENV],
     extraMetadata: {
         version,
     },
@@ -46,8 +64,8 @@ module.exports = {
         type: 'distribution',
     },
     dmg: {
-        title: 'New Expensify',
-        artifactName: 'NewExpensify.dmg',
+        title: productNames[process.env.ELECTRON_ENV],
+        artifactName: artifactNames[process.env.ELECTRON_ENV],
         internetEnabled: true,
     },
     publish: [
@@ -65,7 +83,7 @@ module.exports = {
         output: 'desktop-build',
     },
     protocols: {
-        name: 'New Expensify',
+        name: productNames[process.env.ELECTRON_ENV],
         schemes: ['new-expensify'],
     },
 };
diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index d87226269a8b..64ed3fda8b02 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		02BE6CF80ED1BD2445267F92 /* Pods-NewExpensify.release development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release development.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release development.xcconfig"; sourceTree = "<group>"; };
 		0B09CE5BDAF34DD3573AB4E2 /* Pods-NewExpensify.debug adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug adhoc.xcconfig"; sourceTree = "<group>"; };
+		0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugdevelopment.xcconfig"; sourceTree = "<group>"; };
 		0CDA8E33287DD650004ECBEC /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = NewExpensify/AppDelegate.mm; sourceTree = "<group>"; };
 		0CDA8E36287DD6A0004ECBEC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = NewExpensify/Images.xcassets; sourceTree = "<group>"; };
 		0E27AA27706D894246E7946D /* Pods-NewExpensify.debug production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug production.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug production.xcconfig"; sourceTree = "<group>"; };
@@ -64,38 +65,49 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NewExpensify/main.m; sourceTree = "<group>"; };
 		18D050DF262400AF000D658B /* BridgingFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgingFile.swift; sourceTree = "<group>"; };
 		1DDE5449979A136852B939B5 /* Pods-NewExpensify.release adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release adhoc.xcconfig"; sourceTree = "<group>"; };
+		25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; sourceTree = "<group>"; };
+		30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releasedevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releasedevelopment.xcconfig"; sourceTree = "<group>"; };
 		34A8FDD1F9AA58B8F15C8380 /* Pods-NewExpensify.release production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release production.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release production.xcconfig"; sourceTree = "<group>"; };
 		374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OriginImageRequestHandler.h; path = NewExpensify/OriginImageRequestHandler.h; sourceTree = "<group>"; };
 		374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OriginImageRequestHandler.mm; path = NewExpensify/OriginImageRequestHandler.mm; sourceTree = "<group>"; };
 		3D393D7ABC1092F1DE91397F /* Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug staging.xcconfig"; sourceTree = "<group>"; };
 		432FF5842B766535509FC547 /* Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig"; sourceTree = "<group>"; };
 		44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = "<group>"; };
+		47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releaseproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releaseproduction.xcconfig"; sourceTree = "<group>"; };
+		4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig"; sourceTree = "<group>"; };
 		52796131E6554494B2DDB056 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = "<group>"; };
+		57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig"; sourceTree = "<group>"; };
 		6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig"; sourceTree = "<group>"; };
 		6BE16DA6EFF88513DB1CD47B /* Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig"; sourceTree = "<group>"; };
+		6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugadhoc.xcconfig"; sourceTree = "<group>"; };
 		6FB387B20AE4E6E98858B6AA /* libPods-NewExpensify-NewExpensifyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify-NewExpensifyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = "<group>"; };
 		7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = "<group>"; };
 		70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = "<group>"; };
 		75CABB0D0ABB0082FE0EB600 /* Pods-NewExpensify.release staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.release staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.release staging.xcconfig"; sourceTree = "<group>"; };
+		8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; sourceTree = "<group>"; };
 		8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/native/ExpensifyNeue-BoldItalic.otf"; sourceTree = "<group>"; };
 		8D3B36BF88E773E3C1A383FA /* Pods-NewExpensify.debug staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug staging.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug staging.xcconfig"; sourceTree = "<group>"; };
 		96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release production.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release production.xcconfig"; sourceTree = "<group>"; };
 		AEFE6CD54912D427D19133C7 /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BD6E1BA27D6ABE0AC9D70586 /* Pods-NewExpensify-NewExpensifyTests.release development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.release development.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.release development.xcconfig"; sourceTree = "<group>"; };
+		BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releaseadhoc.xcconfig"; sourceTree = "<group>"; };
 		BF6A4C5167244B9FB8E4D4E3 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/native/ExpensifyNeue-Italic.otf"; sourceTree = "<group>"; };
+		CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugproduction.xcconfig"; sourceTree = "<group>"; };
 		CECC4CBB97A55705A33BEA9E /* Pods-NewExpensify.debug development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug development.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug development.xcconfig"; sourceTree = "<group>"; };
 		D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = "<group>"; };
 		DB76E0D5C670190A0997C71E /* Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig"; sourceTree = "<group>"; };
 		DCF33E34FFEC48128CDD41D4 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/native/ExpensifyMono-Bold.otf"; sourceTree = "<group>"; };
 		DD7904292792E76D004484B4 /* RCTBootSplash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTBootSplash.h; path = NewExpensify/RCTBootSplash.h; sourceTree = "<group>"; };
 		DD79042A2792E76D004484B4 /* RCTBootSplash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTBootSplash.m; path = NewExpensify/RCTBootSplash.m; sourceTree = "<group>"; };
+		E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig"; sourceTree = "<group>"; };
 		E2F1036F70CBFE39E9352674 /* Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig"; sourceTree = "<group>"; };
 		E704648954784DDFBAADF568 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/native/ExpensifyMono-Regular.otf"; sourceTree = "<group>"; };
 		E9DF872C2525201700607FDC /* AirshipConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AirshipConfig.plist; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 		F0C450E92705020500FD2970 /* colors.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = colors.json; path = ../colors.json; sourceTree = "<group>"; };
+		F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; sourceTree = "<group>"; };
 		F4F8A052A22040339996324B /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/native/ExpensifyNeue-Regular.otf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -239,6 +251,18 @@
 				6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */,
 				6BE16DA6EFF88513DB1CD47B /* Pods-NewExpensify-NewExpensifyTests.release staging.xcconfig */,
 				96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */,
+				0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */,
+				6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */,
+				CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */,
+				30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */,
+				BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */,
+				47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */,
+				8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */,
+				25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */,
+				F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */,
+				4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */,
+				E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */,
+				57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -641,9 +665,9 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		00E356F61AD99517003FC87E /* Debug Development */ = {
+		00E356F61AD99517003FC87E /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E2F1036F70CBFE39E9352674 /* Pods-NewExpensify-NewExpensifyTests.debug development.xcconfig */;
+			baseConfigurationReference = 8709DF3C8D91F0FC1581CDD7 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -664,11 +688,11 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		00E356F71AD99517003FC87E /* Release Development */ = {
+		00E356F71AD99517003FC87E /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BD6E1BA27D6ABE0AC9D70586 /* Pods-NewExpensify-NewExpensifyTests.release development.xcconfig */;
+			baseConfigurationReference = 4E8BF7B08BA3181991BFCF4B /* Pods-NewExpensify-NewExpensifyTests.releasedevelopment.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -687,11 +711,11 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		13B07F941A680F5B00A75B9A /* Debug Development */ = {
+		13B07F941A680F5B00A75B9A /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CECC4CBB97A55705A33BEA9E /* Pods-NewExpensify.debug development.xcconfig */;
+			baseConfigurationReference = 0B627F2A465153FFA6E3A4E0 /* Pods-NewExpensify.debugdevelopment.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -719,11 +743,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		13B07F951A680F5B00A75B9A /* Release Development */ = {
+		13B07F951A680F5B00A75B9A /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 02BE6CF80ED1BD2445267F92 /* Pods-NewExpensify.release development.xcconfig */;
+			baseConfigurationReference = 30FFBD291B71222A393D9CC9 /* Pods-NewExpensify.releasedevelopment.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -749,9 +773,9 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		83CBBA201A601CBA00E9B192 /* Debug Development */ = {
+		83CBBA201A601CBA00E9B192 /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -814,9 +838,9 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug Development";
+			name = DebugDevelopment;
 		};
-		83CBBA211A601CBA00E9B192 /* Release Development */ = {
+		83CBBA211A601CBA00E9B192 /* ReleaseDevelopment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -873,9 +897,9 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release Development";
+			name = ReleaseDevelopment;
 		};
-		CF9AF93E29EE9276001FA527 /* Debug Production */ = {
+		CF9AF93E29EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -938,11 +962,11 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF93F29EE9276001FA527 /* Debug Production */ = {
+		CF9AF93F29EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0E27AA27706D894246E7946D /* Pods-NewExpensify.debug production.xcconfig */;
+			baseConfigurationReference = CE2F84BEE9A6DCC228AF7E42 /* Pods-NewExpensify.debugproduction.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -970,11 +994,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF94029EE9276001FA527 /* Debug Production */ = {
+		CF9AF94029EE9276001FA527 /* DebugProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = DB76E0D5C670190A0997C71E /* Pods-NewExpensify-NewExpensifyTests.debug production.xcconfig */;
+			baseConfigurationReference = F15A36A3262EEC3B0CAB8EDF /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -995,9 +1019,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug Production";
+			name = DebugProduction;
 		};
-		CF9AF94429EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94429EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1060,11 +1084,11 @@
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94529EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94529EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0B09CE5BDAF34DD3573AB4E2 /* Pods-NewExpensify.debug adhoc.xcconfig */;
+			baseConfigurationReference = 6F6A514B4DF07A60EC8355BA /* Pods-NewExpensify.debugadhoc.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconAdHoc;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1092,11 +1116,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94629EE927A001FA527 /* Debug AdHoc */ = {
+		CF9AF94629EE927A001FA527 /* DebugAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 432FF5842B766535509FC547 /* Pods-NewExpensify-NewExpensifyTests.debug adhoc.xcconfig */;
+			baseConfigurationReference = 25A4587E168FD67CF890B448 /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1117,9 +1141,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Debug AdHoc";
+			name = DebugAdHoc;
 		};
-		CF9AF94729EE928E001FA527 /* Release Production */ = {
+		CF9AF94729EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1176,11 +1200,11 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94829EE928E001FA527 /* Release Production */ = {
+		CF9AF94829EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34A8FDD1F9AA58B8F15C8380 /* Pods-NewExpensify.release production.xcconfig */;
+			baseConfigurationReference = 47D5DF3C6779D41BE70CD031 /* Pods-NewExpensify.releaseproduction.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1206,11 +1230,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94929EE928E001FA527 /* Release Production */ = {
+		CF9AF94929EE928E001FA527 /* ReleaseProduction */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 96552D489D9F09B6A5ABD81B /* Pods-NewExpensify-NewExpensifyTests.release production.xcconfig */;
+			baseConfigurationReference = 57DBBEDB9692E096D4BA0141 /* Pods-NewExpensify-NewExpensifyTests.releaseproduction.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1229,9 +1253,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release Production";
+			name = ReleaseProduction;
 		};
-		CF9AF94D29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94D29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1288,11 +1312,11 @@
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
-		CF9AF94E29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94E29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1DDE5449979A136852B939B5 /* Pods-NewExpensify.release adhoc.xcconfig */;
+			baseConfigurationReference = BD8828A882E2D6B51362AAC3 /* Pods-NewExpensify.releaseadhoc.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconAdHoc;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
@@ -1318,11 +1342,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
-		CF9AF94F29EE9293001FA527 /* Release AdHoc */ = {
+		CF9AF94F29EE9293001FA527 /* ReleaseAdHoc */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6B5211DB0EEB46E12DF4AD2D /* Pods-NewExpensify-NewExpensifyTests.release adhoc.xcconfig */;
+			baseConfigurationReference = E2C8555C607612465A7473F8 /* Pods-NewExpensify-NewExpensifyTests.releaseadhoc.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1341,7 +1365,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
 			};
-			name = "Release AdHoc";
+			name = ReleaseAdHoc;
 		};
 /* End XCBuildConfiguration section */
 
@@ -1349,41 +1373,41 @@
 		00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "NewExpensifyTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				00E356F61AD99517003FC87E /* Debug Development */,
-				CF9AF94629EE927A001FA527 /* Debug AdHoc */,
-				CF9AF94029EE9276001FA527 /* Debug Production */,
-				00E356F71AD99517003FC87E /* Release Development */,
-				CF9AF94F29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94929EE928E001FA527 /* Release Production */,
+				00E356F61AD99517003FC87E /* DebugDevelopment */,
+				CF9AF94629EE927A001FA527 /* DebugAdHoc */,
+				CF9AF94029EE9276001FA527 /* DebugProduction */,
+				00E356F71AD99517003FC87E /* ReleaseDevelopment */,
+				CF9AF94F29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94929EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "NewExpensify" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				13B07F941A680F5B00A75B9A /* Debug Development */,
-				CF9AF94529EE927A001FA527 /* Debug AdHoc */,
-				CF9AF93F29EE9276001FA527 /* Debug Production */,
-				13B07F951A680F5B00A75B9A /* Release Development */,
-				CF9AF94E29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94829EE928E001FA527 /* Release Production */,
+				13B07F941A680F5B00A75B9A /* DebugDevelopment */,
+				CF9AF94529EE927A001FA527 /* DebugAdHoc */,
+				CF9AF93F29EE9276001FA527 /* DebugProduction */,
+				13B07F951A680F5B00A75B9A /* ReleaseDevelopment */,
+				CF9AF94E29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94829EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "NewExpensify" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				83CBBA201A601CBA00E9B192 /* Debug Development */,
-				CF9AF94429EE927A001FA527 /* Debug AdHoc */,
-				CF9AF93E29EE9276001FA527 /* Debug Production */,
-				83CBBA211A601CBA00E9B192 /* Release Development */,
-				CF9AF94D29EE9293001FA527 /* Release AdHoc */,
-				CF9AF94729EE928E001FA527 /* Release Production */,
+				83CBBA201A601CBA00E9B192 /* DebugDevelopment */,
+				CF9AF94429EE927A001FA527 /* DebugAdHoc */,
+				CF9AF93E29EE9276001FA527 /* DebugProduction */,
+				83CBBA211A601CBA00E9B192 /* ReleaseDevelopment */,
+				CF9AF94D29EE9293001FA527 /* ReleaseAdHoc */,
+				CF9AF94729EE928E001FA527 /* ReleaseProduction */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = "Debug Development";
+			defaultConfigurationName = DebugDevelopment;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme
index 0e0fad6399a0..6cd590456eed 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme	
@@ -57,7 +57,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug AdHoc"
+      buildConfiguration = "DebugAdHoc"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
@@ -75,7 +75,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug AdHoc"
+      buildConfiguration = "DebugAdHoc"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -96,7 +96,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release AdHoc"
+      buildConfiguration = "ReleaseAdHoc"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -113,10 +113,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug AdHoc">
+      buildConfiguration = "DebugAdHoc">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release AdHoc"
+      buildConfiguration = "ReleaseAdHoc"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme
index 77f512242f67..93d775217f11 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme	
@@ -23,7 +23,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug Development"
+      buildConfiguration = "DebugDevelopment"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug Development"
+      buildConfiguration = "DebugDevelopment"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -62,7 +62,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release Development"
+      buildConfiguration = "ReleaseDevelopment"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -79,10 +79,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug Development">
+      buildConfiguration = "DebugDevelopment">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release Development"
+      buildConfiguration = "ReleaseDevelopment"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme
index f68be2705527..b6b5874506a8 100644
--- a/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme	
+++ b/ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme	
@@ -75,7 +75,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -96,7 +96,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -113,10 +113,10 @@
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "Debug Production">
+      buildConfiguration = "DebugProduction">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release Production"
+      buildConfiguration = "ReleaseProduction"
       customArchiveName = "New Expensify"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 97875d4a2945..22a72c5d9b0d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.68</string>
+	<string>1.3.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.68.12</string>
+	<string>1.3.70.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 83065d9e9d78..8e76ad5b6c60 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.68</string>
+	<string>1.3.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.68.12</string>
+	<string>1.3.70.3</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
index 6445685db014..b30510572448 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -22,7 +22,7 @@ prepare_react_native_project!
 #   dependencies: {
 #     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
 # ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['Debug Production', 'Debug Development', 'Debug AdHoc'])
+flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['DebugProduction', 'DebugDevelopment', 'DebugAdHoc'])
 
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
@@ -54,12 +54,12 @@ target 'NewExpensify' do
   permissions_path = '../node_modules/react-native-permissions/ios'
 
   project 'NewExpensify',
-    'Debug Development' => :debug,
-    'Debug AdHoc' => :debug,
-    'Debug Production' => :debug,
-    'Release Development' => :release,
-    'Release AdHoc' => :release,
-    'Release Production' => :release
+    'DebugDevelopment' => :debug,
+    'DebugAdHoc' => :debug,
+    'DebugProduction' => :debug,
+    'ReleaseDevelopment' => :release,
+    'ReleaseAdHoc' => :release,
+    'ReleaseProduction' => :release
 
   pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
   pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2bea672171fe..aeb1887223cd 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1309,6 +1309,6 @@ SPEC CHECKSUMS:
   Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 845537d35601574adcd0794e17003ba7dbccdbfd
+PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14
 
 COCOAPODS: 1.12.1
diff --git a/package-lock.json b/package-lock.json
index 1ae63b31fd0c..c27370ff864a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,17 @@
 {
   "name": "new.expensify",
-  "version": "1.3.68-12",
+  "version": "1.3.70-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.68-12",
+      "version": "1.3.70-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@expensify/react-native-web": "0.18.15",
+        "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-getcanonicallocales": "^2.2.0",
         "@formatjs/intl-listformat": "^7.2.2",
         "@formatjs/intl-locale": "^3.3.0",
@@ -18,6 +19,8 @@
         "@formatjs/intl-pluralrules": "^5.2.2",
         "@gorhom/portal": "^1.0.14",
         "@invertase/react-native-apple-authentication": "^2.2.2",
+        "@kie/act-js": "^2.0.1",
+        "@kie/mock-github": "^1.0.0",
         "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52",
         "@onfido/react-native-sdk": "7.4.0",
         "@react-native-async-storage/async-storage": "^1.17.10",
@@ -36,6 +39,7 @@
         "@react-navigation/stack": "6.3.16",
         "@react-ng/bounds-observer": "^0.2.1",
         "@rnmapbox/maps": "^10.0.11",
+        "@types/node": "^18.14.0",
         "@ua/react-native-airship": "^15.2.6",
         "awesome-phonenumber": "^5.4.0",
         "babel-plugin-transform-remove-console": "^6.9.4",
@@ -48,6 +52,7 @@
         "domhandler": "^4.3.0",
         "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
         "fbjs": "^3.0.2",
+        "focus-trap-react": "^10.2.1",
         "htmlparser2": "^7.2.0",
         "idb-keyval": "^6.2.1",
         "jest-when": "^3.5.2",
@@ -60,7 +65,7 @@
         "patch-package": "^8.0.0",
         "process": "^0.11.10",
         "prop-types": "^15.7.2",
-        "pusher-js": "7.4.0",
+        "pusher-js": "8.3.0",
         "react": "18.2.0",
         "react-collapse": "^5.1.0",
         "react-content-loader": "^6.1.0",
@@ -85,7 +90,7 @@
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "1.0.72",
+        "react-native-onyx": "1.0.76",
         "react-native-pager-view": "^6.2.0",
         "react-native-pdf": "^6.7.1",
         "react-native-performance": "^4.0.0",
@@ -128,6 +133,8 @@
         "@babel/runtime": "^7.20.0",
         "@electron/notarize": "^1.2.3",
         "@jest/globals": "^29.5.0",
+        "@kie/act-js": "^2.0.1",
+        "@kie/mock-github": "^1.0.0",
         "@octokit/core": "4.0.4",
         "@octokit/plugin-paginate-rest": "3.1.0",
         "@octokit/plugin-throttling": "4.1.0",
@@ -179,7 +186,7 @@
         "css-loader": "^6.7.2",
         "diff-so-fancy": "^1.3.0",
         "dotenv": "^16.0.3",
-        "electron": "^25.8.0",
+        "electron": "^25.8.1",
         "electron-builder": "24.6.4",
         "eslint": "^7.6.0",
         "eslint-config-airbnb-typescript": "^17.1.0",
@@ -221,7 +228,8 @@
         "webpack-cli": "^4.10.0",
         "webpack-dev-server": "^4.9.3",
         "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-merge": "^5.8.0"
+        "webpack-merge": "^5.8.0",
+        "yaml": "^2.2.1"
       },
       "engines": {
         "node": "16.15.1",
@@ -3688,6 +3696,33 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@formatjs/intl-datetimeformat": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.10.0.tgz",
+      "integrity": "sha512-5tJWZxOyP5D4PDrqv27h0LWAPHhQM9BHR0pDBTZOKWFEZNrS2IgREbyalSGwQLtN1tZaDrt3YeNfNLbZk1wSUw==",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "1.17.0",
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@formatjs/intl-datetimeformat/node_modules/@formatjs/ecma402-abstract": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz",
+      "integrity": "sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==",
+      "dependencies": {
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@formatjs/intl-datetimeformat/node_modules/@formatjs/intl-localematcher": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz",
+      "integrity": "sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@formatjs/intl-enumerator": {
       "version": "1.3.0",
       "license": "MIT",
@@ -5193,6 +5228,110 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
       "dev": true
     },
+    "node_modules/@kie/act-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@kie/act-js/-/act-js-2.3.0.tgz",
+      "integrity": "sha512-Q9k0b05uA46jXKWmVfoGDW+0xsCcE7QPiHi8IH7h41P36DujHKBj4k28RCeIEx3IwUCxYHKwubN8DH4Vzc9XcA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@kie/mock-github": "^2.0.0",
+        "adm-zip": "^0.5.10",
+        "ajv": "^8.12.0",
+        "bin-links": "^4.0.1",
+        "express": "^4.18.1",
+        "follow-redirects": "^1.15.2",
+        "tar": "^6.1.13",
+        "yaml": "^2.1.3"
+      },
+      "bin": {
+        "act-js": "bin/act"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/@kie/mock-github": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-2.0.0.tgz",
+      "integrity": "sha512-od6UyICJYKMnz9HgEWCQAFT/JsCpKkLp+JQH8fV23tf+ZmmQI1dK3C20k6aO5uJhAHA0yOcFtbKFVF4+8i3DTg==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types-ghec": "^18.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/@octokit/openapi-types-ghec": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-18.0.0.tgz",
+      "integrity": "sha512-xY5FTR/DW2gUJdC5GyzkqrfMHhr3u3hg+dUG6bA5FvuuODw6A7+0JTTSS1ndLQEKGmFxP7chf1BKkhvhnqxCew==",
+      "dev": true
+    },
+    "node_modules/@kie/act-js/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@kie/act-js/node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@kie/mock-github": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-1.1.0.tgz",
+      "integrity": "sha512-fD+utlOiyZSOutOcXL0G9jfjbtvOO44PLUyTfgfkrm1+575R/dbvU6AcJfjc1DtHeRv7FC7f4ebyU+a1wgL6CA==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types-ghec": "^14.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      }
+    },
+    "node_modules/@kie/mock-github/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@kie/mock-github/node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -5699,6 +5838,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@octokit/openapi-types-ghec": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-14.0.0.tgz",
+      "integrity": "sha512-xhd9oEvn2aroGn+sk09Ptx/76Y7aKU0EIgHukHPCU1+rGJreO36baEEk6k8ZPblieHNM39FcykJQmtDrETm0KA==",
+      "dev": true
+    },
     "node_modules/@octokit/plugin-paginate-rest": {
       "version": "3.1.0",
       "dev": true,
@@ -6929,14 +7074,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-doctor/node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/@react-native-community/cli-hermes": {
       "version": "11.3.5",
       "resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-11.3.5.tgz",
@@ -19380,6 +19517,15 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adm-zip": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -21217,6 +21363,46 @@
         "node": "*"
       }
     },
+    "node_modules/bin-links": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
+      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
+      "dev": true,
+      "dependencies": {
+        "cmd-shim": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "read-cmd-shim": "^4.0.0",
+        "write-file-atomic": "^5.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/bin-links/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/bin-links/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "devOptional": true,
@@ -22650,6 +22836,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/cmd-shim": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
+      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
       "license": "MIT",
@@ -23304,6 +23499,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/cp-file": {
       "version": "7.0.0",
       "dev": true,
@@ -24840,9 +25044,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "25.8.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.0.tgz",
-      "integrity": "sha512-T3kC1a/3ntSaYMCVVfUUc9v7myPzi6J2GP0Ad/CyfWKDPp054dGyKxb2EEjKnxQQ7wfjsT1JTEdBG04x6ekVBw==",
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -28091,8 +28295,32 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "node_modules/focus-trap": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz",
+      "integrity": "sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==",
+      "dependencies": {
+        "tabbable": "^6.2.0"
+      }
+    },
+    "node_modules/focus-trap-react": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-10.2.1.tgz",
+      "integrity": "sha512-UrAKOn52lvfHF6lkUMfFhlQxFgahyNW5i6FpHWkDxAeD4FSk3iwx9n4UEA4Sims0G5WiGIi0fAyoq3/UVeNCYA==",
+      "dependencies": {
+        "focus-trap": "^7.5.2",
+        "tabbable": "^6.2.0"
+      },
+      "peerDependencies": {
+        "prop-types": "^15.8.1",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      }
+    },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true,
       "funding": [
         {
@@ -28100,7 +28328,6 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -28299,6 +28526,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "dev": true,
@@ -37534,6 +37770,21 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      }
+    },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
@@ -37717,6 +37968,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "license": "MIT",
@@ -38687,14 +38947,6 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/patch-package/node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "0.0.1",
       "license": "MIT"
@@ -39393,6 +39645,15 @@
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/property-information": {
       "version": "5.6.0",
       "dev": true,
@@ -39484,10 +39745,10 @@
       }
     },
     "node_modules/pusher-js": {
-      "version": "7.4.0",
-      "license": "MIT",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
+      "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
       "dependencies": {
-        "@types/node": "^14.14.31",
         "tweetnacl": "^1.0.3"
       }
     },
@@ -39499,11 +39760,6 @@
         "node": ">=4.2.4"
       }
     },
-    "node_modules/pusher-js/node_modules/@types/node": {
-      "version": "14.18.56",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.56.tgz",
-      "integrity": "sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w=="
-    },
     "node_modules/qrcode": {
       "version": "1.5.3",
       "license": "MIT",
@@ -40311,9 +40567,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "1.0.72",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.72.tgz",
-      "integrity": "sha512-roJuA92qZH2PLYSqBhSPCse+Ra2EJu4FBpVqguwJRp6oaLNHR1CtPTgU1xMh/kj2nWmdpcqKoOc3nS35asb80g==",
+      "version": "1.0.76",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.76.tgz",
+      "integrity": "sha512-mcMlYQCo1B/kom+4hu7CQKKLwvPFjQAJsVIzV2s9aa8XKNlcnYiJbfuM6RSJ1fFmSIeud4Y66rhv4/oWUkSl5A==",
       "dependencies": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -41403,6 +41659,15 @@
         "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/read-cmd-shim": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
+      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/read-config-file": {
       "version": "6.3.2",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
@@ -44427,6 +44692,11 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/tabbable": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
+    },
     "node_modules/table": {
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
@@ -47697,11 +47967,11 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "dev": true,
-      "license": "ISC",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
@@ -50130,6 +50400,35 @@
         "tslib": "^2.4.0"
       }
     },
+    "@formatjs/intl-datetimeformat": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-6.10.0.tgz",
+      "integrity": "sha512-5tJWZxOyP5D4PDrqv27h0LWAPHhQM9BHR0pDBTZOKWFEZNrS2IgREbyalSGwQLtN1tZaDrt3YeNfNLbZk1wSUw==",
+      "requires": {
+        "@formatjs/ecma402-abstract": "1.17.0",
+        "@formatjs/intl-localematcher": "0.4.0",
+        "tslib": "^2.4.0"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz",
+          "integrity": "sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==",
+          "requires": {
+            "@formatjs/intl-localematcher": "0.4.0",
+            "tslib": "^2.4.0"
+          }
+        },
+        "@formatjs/intl-localematcher": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz",
+          "integrity": "sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==",
+          "requires": {
+            "tslib": "^2.4.0"
+          }
+        }
+      }
+    },
     "@formatjs/intl-enumerator": {
       "version": "1.3.0",
       "requires": {
@@ -51206,6 +51505,98 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
       "dev": true
     },
+    "@kie/act-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@kie/act-js/-/act-js-2.3.0.tgz",
+      "integrity": "sha512-Q9k0b05uA46jXKWmVfoGDW+0xsCcE7QPiHi8IH7h41P36DujHKBj4k28RCeIEx3IwUCxYHKwubN8DH4Vzc9XcA==",
+      "dev": true,
+      "requires": {
+        "@kie/mock-github": "^2.0.0",
+        "adm-zip": "^0.5.10",
+        "ajv": "^8.12.0",
+        "bin-links": "^4.0.1",
+        "express": "^4.18.1",
+        "follow-redirects": "^1.15.2",
+        "tar": "^6.1.13",
+        "yaml": "^2.1.3"
+      },
+      "dependencies": {
+        "@kie/mock-github": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-2.0.0.tgz",
+          "integrity": "sha512-od6UyICJYKMnz9HgEWCQAFT/JsCpKkLp+JQH8fV23tf+ZmmQI1dK3C20k6aO5uJhAHA0yOcFtbKFVF4+8i3DTg==",
+          "dev": true,
+          "requires": {
+            "@octokit/openapi-types-ghec": "^18.0.0",
+            "ajv": "^8.11.0",
+            "express": "^4.18.1",
+            "fast-glob": "^3.2.12",
+            "fs-extra": "^10.1.0",
+            "nock": "^13.2.7",
+            "simple-git": "^3.8.0",
+            "totalist": "^3.0.0"
+          }
+        },
+        "@octokit/openapi-types-ghec": {
+          "version": "18.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-18.0.0.tgz",
+          "integrity": "sha512-xY5FTR/DW2gUJdC5GyzkqrfMHhr3u3hg+dUG6bA5FvuuODw6A7+0JTTSS1ndLQEKGmFxP7chf1BKkhvhnqxCew==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "totalist": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+          "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+          "dev": true
+        }
+      }
+    },
+    "@kie/mock-github": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@kie/mock-github/-/mock-github-1.1.0.tgz",
+      "integrity": "sha512-fD+utlOiyZSOutOcXL0G9jfjbtvOO44PLUyTfgfkrm1+575R/dbvU6AcJfjc1DtHeRv7FC7f4ebyU+a1wgL6CA==",
+      "dev": true,
+      "requires": {
+        "@octokit/openapi-types-ghec": "^14.0.0",
+        "ajv": "^8.11.0",
+        "express": "^4.18.1",
+        "fast-glob": "^3.2.12",
+        "fs-extra": "^10.1.0",
+        "nock": "^13.2.7",
+        "simple-git": "^3.8.0",
+        "totalist": "^3.0.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "totalist": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+          "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+          "dev": true
+        }
+      }
+    },
     "@kwsites/file-exists": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -51588,6 +51979,12 @@
       "version": "12.11.0",
       "dev": true
     },
+    "@octokit/openapi-types-ghec": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types-ghec/-/openapi-types-ghec-14.0.0.tgz",
+      "integrity": "sha512-xhd9oEvn2aroGn+sk09Ptx/76Y7aKU0EIgHukHPCU1+rGJreO36baEEk6k8ZPblieHNM39FcykJQmtDrETm0KA==",
+      "dev": true
+    },
     "@octokit/plugin-paginate-rest": {
       "version": "3.1.0",
       "dev": true,
@@ -52501,11 +52898,6 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "yaml": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-          "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
         }
       }
     },
@@ -61211,6 +61603,12 @@
       "version": "1.2.1",
       "dev": true
     },
+    "adm-zip": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "dev": true
+    },
     "agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -62510,6 +62908,36 @@
       "version": "5.2.2",
       "devOptional": true
     },
+    "bin-links": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
+      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
+      "dev": true,
+      "requires": {
+        "cmd-shim": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "read-cmd-shim": "^4.0.0",
+        "write-file-atomic": "^5.0.0"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        },
+        "write-file-atomic": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+          "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+          "dev": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^4.0.1"
+          }
+        }
+      }
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "devOptional": true
@@ -63485,6 +63913,12 @@
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
       "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
     },
+    "cmd-shim": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
+      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
+      "dev": true
+    },
     "co": {
       "version": "4.6.0"
     },
@@ -63919,6 +64353,14 @@
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
         "yaml": "^1.10.0"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
       }
     },
     "cp-file": {
@@ -64991,9 +65433,9 @@
       }
     },
     "electron": {
-      "version": "25.8.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.0.tgz",
-      "integrity": "sha512-T3kC1a/3ntSaYMCVVfUUc9v7myPzi6J2GP0Ad/CyfWKDPp054dGyKxb2EEjKnxQQ7wfjsT1JTEdBG04x6ekVBw==",
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^2.0.0",
@@ -67266,8 +67708,27 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "focus-trap": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.2.tgz",
+      "integrity": "sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==",
+      "requires": {
+        "tabbable": "^6.2.0"
+      }
+    },
+    "focus-trap-react": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-10.2.1.tgz",
+      "integrity": "sha512-UrAKOn52lvfHF6lkUMfFhlQxFgahyNW5i6FpHWkDxAeD4FSk3iwx9n4UEA4Sims0G5WiGIi0fAyoq3/UVeNCYA==",
+      "requires": {
+        "focus-trap": "^7.5.2",
+        "tabbable": "^6.2.0"
+      }
+    },
     "follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true
     },
     "for-each": {
@@ -67383,6 +67844,12 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
         }
       }
     },
@@ -73699,6 +74166,18 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz",
       "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="
     },
+    "nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
+      }
+    },
     "node-abort-controller": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
@@ -73832,6 +74311,12 @@
       "version": "6.1.0",
       "dev": true
     },
+    "npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true
+    },
     "npm-run-path": {
       "version": "4.0.1",
       "requires": {
@@ -74463,11 +74948,6 @@
           "requires": {
             "os-tmpdir": "~1.0.2"
           }
-        },
-        "yaml": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-          "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
         }
       }
     },
@@ -74932,6 +75412,12 @@
         "react-is": "^16.13.1"
       }
     },
+    "propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "dev": true
+    },
     "property-information": {
       "version": "5.6.0",
       "dev": true,
@@ -75008,17 +75494,11 @@
       "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
     },
     "pusher-js": {
-      "version": "7.4.0",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
+      "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
       "requires": {
-        "@types/node": "^14.14.31",
         "tweetnacl": "^1.0.3"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "14.18.56",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.56.tgz",
-          "integrity": "sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w=="
-        }
       }
     },
     "pusher-js-mock": {
@@ -75636,9 +76116,9 @@
       }
     },
     "react-native-onyx": {
-      "version": "1.0.72",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.72.tgz",
-      "integrity": "sha512-roJuA92qZH2PLYSqBhSPCse+Ra2EJu4FBpVqguwJRp6oaLNHR1CtPTgU1xMh/kj2nWmdpcqKoOc3nS35asb80g==",
+      "version": "1.0.76",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.76.tgz",
+      "integrity": "sha512-mcMlYQCo1B/kom+4hu7CQKKLwvPFjQAJsVIzV2s9aa8XKNlcnYiJbfuM6RSJ1fFmSIeud4Y66rhv4/oWUkSl5A==",
       "requires": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -76222,6 +76702,12 @@
         "memoize-one": ">=3.1.1 <6"
       }
     },
+    "read-cmd-shim": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
+      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
+      "dev": true
+    },
     "read-config-file": {
       "version": "6.3.2",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
@@ -78362,6 +78848,11 @@
       "version": "2.0.15",
       "dev": true
     },
+    "tabbable": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
+    },
     "table": {
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
@@ -80552,8 +81043,9 @@
       "version": "4.0.0"
     },
     "yaml": {
-      "version": "1.10.2",
-      "dev": true
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
+      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg=="
     },
     "yargs": {
       "version": "13.3.2",
diff --git a/package.json b/package.json
index 340a1c8d0880..e16d36f50632 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.68-12",
+  "version": "1.3.70-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -11,10 +11,10 @@
     "postinstall": "scripts/postInstall.sh",
     "clean": "npx react-native clean-project-auto",
     "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --variant=developmentDebug --appId=com.expensify.chat.dev",
-    "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --configuration=\"Debug Development\" --scheme=\"New Expensify Dev\"",
+    "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --configuration=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
     "pod-install": "cd ios && bundle exec pod install",
-    "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
-    "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
+    "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
+    "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
     "start": "npx react-native start",
     "web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
     "web-proxy": "node web/proxy.js",
@@ -47,10 +47,13 @@
     "analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
-    "test:e2e": "node tests/e2e/testRunner.js --development"
+    "test:e2e": "node tests/e2e/testRunner.js --development",
+    "workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
+    "workflow-test:generate": "node workflow_tests/utils/preGenerateTest.js"
   },
   "dependencies": {
     "@expensify/react-native-web": "0.18.15",
+    "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-getcanonicallocales": "^2.2.0",
     "@formatjs/intl-listformat": "^7.2.2",
     "@formatjs/intl-locale": "^3.3.0",
@@ -59,6 +62,8 @@
     "@gorhom/portal": "^1.0.14",
     "@invertase/react-native-apple-authentication": "^2.2.2",
     "@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#5cdae3d4455b03a04c57f50be3863e2fe6c92c52",
+    "@kie/act-js": "^2.0.1",
+    "@kie/mock-github": "^1.0.0",
     "@onfido/react-native-sdk": "7.4.0",
     "@react-native-async-storage/async-storage": "^1.17.10",
     "@react-native-camera-roll/camera-roll": "5.4.0",
@@ -78,6 +83,7 @@
     "@rnmapbox/maps": "^10.0.11",
     "@ua/react-native-airship": "^15.2.6",
     "awesome-phonenumber": "^5.4.0",
+    "@types/node": "^18.14.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
     "canvas-size": "^1.2.6",
@@ -88,6 +94,7 @@
     "domhandler": "^4.3.0",
     "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
     "fbjs": "^3.0.2",
+    "focus-trap-react": "^10.2.1",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
     "jest-when": "^3.5.2",
@@ -100,7 +107,7 @@
     "patch-package": "^8.0.0",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "pusher-js": "7.4.0",
+    "pusher-js": "8.3.0",
     "react": "18.2.0",
     "react-collapse": "^5.1.0",
     "react-content-loader": "^6.1.0",
@@ -125,7 +132,7 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.72",
+    "react-native-onyx": "1.0.76",
     "react-native-pager-view": "^6.2.0",
     "react-native-pdf": "^6.7.1",
     "react-native-performance": "^4.0.0",
@@ -168,6 +175,8 @@
     "@babel/runtime": "^7.20.0",
     "@electron/notarize": "^1.2.3",
     "@jest/globals": "^29.5.0",
+    "@kie/act-js": "^2.0.1",
+    "@kie/mock-github": "^1.0.0",
     "@octokit/core": "4.0.4",
     "@octokit/plugin-paginate-rest": "3.1.0",
     "@octokit/plugin-throttling": "4.1.0",
@@ -219,7 +228,7 @@
     "css-loader": "^6.7.2",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "^25.8.0",
+    "electron": "^25.8.1",
     "electron-builder": "24.6.4",
     "eslint": "^7.6.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
@@ -261,7 +270,8 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.3",
     "webpack-font-preload-plugin": "^1.5.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "yaml": "^2.2.1"
   },
   "overrides": {
     "react-native": "$react-native"
diff --git a/src/App.js b/src/App.js
index 7ec82b9a4f8a..284c6115d7b8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -22,6 +22,7 @@ import ThemeProvider from './styles/themes/ThemeProvider';
 import ThemeStylesProvider from './styles/ThemeStylesProvider';
 import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
+import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
 import * as Session from './libs/actions/Session';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
@@ -58,6 +59,7 @@ function App() {
                     KeyboardStateProvider,
                     PopoverContextProvider,
                     CurrentReportIDContextProvider,
+                    ReportAttachmentsProvider,
                     PickerStateProvider,
                     EnvironmentProvider,
                     ThemeProvider,
diff --git a/src/CONST.ts b/src/CONST.ts
index dc7313d1137a..57b4d81f145a 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -240,6 +240,8 @@ const CONST = {
         TASKS: 'tasks',
         THREADS: 'threads',
         CUSTOM_STATUS: 'customStatus',
+        NEW_DOT_CATEGORIES: 'newDotCategories',
+        NEW_DOT_TAGS: 'newDotTags',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -1089,6 +1091,29 @@ const CONST = {
         DEFAULT: 'en',
     },
 
+    LANGUAGES: ['en', 'es'],
+
+    PRONOUNS_LIST: [
+        'coCos',
+        'eEyEmEir',
+        'heHimHis',
+        'heHimHisTheyThemTheirs',
+        'sheHerHers',
+        'sheHerHersTheyThemTheirs',
+        'merMers',
+        'neNirNirs',
+        'neeNerNers',
+        'perPers',
+        'theyThemTheirs',
+        'thonThons',
+        'veVerVis',
+        'viVir',
+        'xeXemXyr',
+        'zeZieZirHir',
+        'zeHirHirs',
+        'callMeByMyName',
+    ],
+
     POLICY: {
         TYPE: {
             FREE: 'free',
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index a2809c439931..2e0b75910bae 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -240,6 +240,8 @@ const ONYXKEYS = {
         POLICY_MEMBERS: 'policyMembers_',
         POLICY_CATEGORIES: 'policyCategories_',
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
+        POLICY_TAGS: 'policyTags_',
+        POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         REPORT: 'report_',
         REPORT_ACTIONS: 'reportActions_',
@@ -375,7 +377,8 @@ type OnyxValues = {
     // Collections
     [ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
     [ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
-    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: unknown;
+    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategory;
+    [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTag;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMember;
@@ -390,6 +393,7 @@ type OnyxValues = {
     [ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING]: boolean;
     [ONYXKEYS.COLLECTION.SECURITY_GROUP]: OnyxTypes.SecurityGroup;
     [ONYXKEYS.COLLECTION.TRANSACTION]: OnyxTypes.Transaction;
+    [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS]: OnyxTypes.RecentlyUsedTags;
     [ONYXKEYS.COLLECTION.SELECTED_TAB]: string;
 
     // Forms
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ed4fbb97a41a..1133dcec8e9a 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -71,7 +71,7 @@ export default {
     NEW_CHAT: 'new/chat',
     NEW_TASK,
     REPORT,
-    REPORT_WITH_ID: 'r/:reportID/:reportActionID?',
+    REPORT_WITH_ID: 'r/:reportID?/:reportActionID?',
     EDIT_REQUEST: 'r/:threadReportID/edit/:field',
     getEditRequestRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}`,
     EDIT_CURRENCY_REQUEST: 'r/:threadReportID/edit/currency',
@@ -98,11 +98,13 @@ export default {
     MONEY_REQUEST_CURRENCY: ':iouType/new/currency/:reportID?',
     MONEY_REQUEST_DESCRIPTION: ':iouType/new/description/:reportID?',
     MONEY_REQUEST_CATEGORY: ':iouType/new/category/:reportID?',
+    MONEY_REQUEST_TAG: ':iouType/new/tag/:reportID?',
     MONEY_REQUEST_MERCHANT: ':iouType/new/merchant/:reportID?',
     MONEY_REQUEST_MANUAL_TAB: ':iouType/new/:reportID?/manual',
     MONEY_REQUEST_SCAN_TAB: ':iouType/new/:reportID?/scan',
     MONEY_REQUEST_DISTANCE_TAB: ':iouType/new/:reportID?/distance',
     MONEY_REQUEST_WAYPOINT: ':iouType/new/waypoint/:waypointIndex',
+    MONEY_REQUEST_ADDRESS: ':iouType/new/address/:reportID?',
     IOU_SEND_ADD_BANK_ACCOUNT: `${IOU_SEND}/add-bank-account`,
     IOU_SEND_ADD_DEBIT_CARD: `${IOU_SEND}/add-debit-card`,
     IOU_SEND_ENABLE_PAYMENTS: `${IOU_SEND}/enable-payments`,
@@ -117,6 +119,8 @@ export default {
     getMoneyRequestMerchantRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`,
     getMoneyRequestDistanceTabRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`,
     getMoneyRequestWaypointRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`,
+    getMoneyRequestAddressRoute: (iouType: string, reportID = '') => `${iouType}/new/address/${reportID}`,
+    getMoneyRequestTagRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`,
     SPLIT_BILL_DETAILS: `r/:reportID/split/:reportActionID`,
     getSplitBillDetailsRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`,
     getNewTaskRoute: (reportID: string) => `${NEW_TASK}/${reportID}`,
@@ -135,10 +139,10 @@ export default {
     FLAG_COMMENT: `flag/:reportID/:reportActionID`,
     getFlagCommentRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}`,
     SEARCH: 'search',
-    SAVE_THE_WORLD: 'save-the-world',
-    I_KNOW_A_TEACHER: 'save-the-world/i-know-a-teacher',
-    INTRO_SCHOOL_PRINCIPAL: 'save-the-world/intro-school-principal',
-    I_AM_A_TEACHER: 'save-the-world/i-am-a-teacher',
+    TEACHERS_UNITE: 'teachersunite',
+    I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher',
+    INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal',
+    I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher',
     DETAILS: 'details',
     getDetailsRoute: (login: string) => `details?login=${encodeURIComponent(login)}`,
     PROFILE: 'a/:accountID',
diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index dbe7e46ff6aa..e2843ba7fae8 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
-import React, {useEffect, useRef, useCallback} from 'react';
+import React, {useEffect, useRef, useCallback, useMemo} from 'react';
 import {ActivityIndicator, View} from 'react-native';
+import {useIsFocused} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -38,6 +39,9 @@ const propTypes = {
     /** Fired when the user exits the Plaid flow */
     onExitPlaid: PropTypes.func,
 
+    /** Fired when the screen is blurred */
+    onBlurPlaid: PropTypes.func,
+
     /** Fired when the user selects an account */
     onSelect: PropTypes.func,
 
@@ -61,6 +65,7 @@ const defaultProps = {
     selectedPlaidAccountID: '',
     plaidLinkToken: '',
     onExitPlaid: () => {},
+    onBlurPlaid: () => {},
     onSelect: () => {},
     text: '',
     receivedRedirectURI: null,
@@ -75,6 +80,7 @@ function AddPlaidBankAccount({
     selectedPlaidAccountID,
     plaidLinkToken,
     onExitPlaid,
+    onBlurPlaid,
     onSelect,
     text,
     receivedRedirectURI,
@@ -88,6 +94,7 @@ function AddPlaidBankAccount({
 
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const isFocused = useIsFocused();
 
     /**
      * @returns {String}
@@ -102,6 +109,11 @@ function AddPlaidBankAccount({
         }
     };
 
+    /**
+     * @returns {Array}
+     */
+    const plaidBankAccounts = useMemo(() => lodashGet(plaidData, 'bankAccounts') || [], [plaidData]);
+
     /**
      * @returns {Boolean}
      * I'm using useCallback so the useEffect which uses this function doesn't run on every render.
@@ -151,6 +163,13 @@ function AddPlaidBankAccount({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
+    useEffect(() => {
+        if (isFocused || plaidBankAccounts.length) {
+            return;
+        }
+        onBlurPlaid();
+    }, [isFocused, onBlurPlaid, plaidBankAccounts.length]);
+
     useEffect(() => {
         // If we are coming back from offline and we haven't authenticated with Plaid yet, we need to re-run our call to kick off Plaid
         // previousNetworkState.current also makes sure that this doesn't run on the first render.
@@ -160,7 +179,6 @@ function AddPlaidBankAccount({
         previousNetworkState.current = isOffline;
     }, [allowDebit, bankAccountID, isAuthenticatedWithPlaid, isOffline]);
 
-    const plaidBankAccounts = lodashGet(plaidData, 'bankAccounts') || [];
     const token = getPlaidLinkToken();
     const options = _.map(plaidBankAccounts, (account) => ({
         value: account.plaidAccountID,
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index c07a4474a68b..d39906faf3a3 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -25,7 +25,6 @@ import HeaderGap from './HeaderGap';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
 import reportPropTypes from '../pages/reportPropTypes';
-import tryResolveUrlFromApiRoot from '../libs/tryResolveUrlFromApiRoot';
 
 /**
  * Modal render prop component that exposes modal launching triggers that can be used
@@ -351,7 +350,7 @@ function AttachmentModal(props) {
                         <AttachmentCarousel
                             report={props.report}
                             onNavigate={onNavigate}
-                            source={tryResolveUrlFromApiRoot(props.source)}
+                            source={props.source}
                             onClose={closeModal}
                             onToggleKeyboard={updateConfirmButtonVisibility}
                             setDownloadButtonVisibility={setDownloadButtonVisibility}
diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index 9ea94ae53d42..9930fa49a909 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -1,6 +1,7 @@
 import React, {useRef} from 'react';
 import CONST from '../../CONST';
 import {propTypes, defaultProps} from './attachmentPickerPropTypes';
+import Visibility from '../../libs/Visibility';
 
 /**
  * Returns acceptable FileTypes based on ATTACHMENT_PICKER_TYPE
@@ -53,7 +54,23 @@ function AttachmentPicker(props) {
                     if (!fileInput.current) {
                         return;
                     }
-                    fileInput.current.addEventListener('cancel', () => onCanceled.current(), {once: true});
+                    fileInput.current.addEventListener(
+                        'cancel',
+                        () => {
+                            // For Android Chrome, the cancel event happens before the page is visible on physical devices,
+                            // which makes it unreliable for us to show the keyboard, while on emulators it happens after the page is visible.
+                            // So here we can delay calling the onCanceled.current function based on visibility in order to reliably show the keyboard.
+                            if (Visibility.isVisible()) {
+                                onCanceled.current();
+                                return;
+                            }
+                            const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+                                onCanceled.current();
+                                unsubscribeVisibilityListener();
+                            });
+                        },
+                        {once: true},
+                    );
                 }}
                 accept={getAcceptableFileTypes(props.type)}
             />
diff --git a/src/components/Attachments/AttachmentCarousel/CarouselItem.js b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
new file mode 100644
index 000000000000..3aeef8482e2d
--- /dev/null
+++ b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
@@ -0,0 +1,115 @@
+import React, {useContext, useState} from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import CONST from '../../../CONST';
+import styles from '../../../styles/styles';
+import useLocalize from '../../../hooks/useLocalize';
+import PressableWithoutFeedback from '../../Pressable/PressableWithoutFeedback';
+import Text from '../../Text';
+import Button from '../../Button';
+import AttachmentView from '../AttachmentView';
+import SafeAreaConsumer from '../../SafeAreaConsumer';
+import ReportAttachmentsContext from '../../../pages/home/report/ReportAttachmentsContext';
+
+const propTypes = {
+    /** Attachment required information such as the source and file name */
+    item: PropTypes.shape({
+        /** Report action ID of the attachment */
+        reportActionID: PropTypes.string,
+
+        /** Whether source URL requires authentication */
+        isAuthTokenRequired: PropTypes.bool,
+
+        /** The source (URL) of the attachment */
+        source: PropTypes.string,
+
+        /** Additional information about the attachment file */
+        file: PropTypes.shape({
+            /** File name of the attachment */
+            name: PropTypes.string,
+        }),
+
+        /** Whether the attachment has been flagged */
+        hasBeenFlagged: PropTypes.bool,
+    }).isRequired,
+
+    /** Whether the attachment is currently being viewed in the carousel */
+    isFocused: PropTypes.bool.isRequired,
+
+    /** onPress callback */
+    onPress: PropTypes.func,
+};
+
+const defaultProps = {
+    onPress: undefined,
+};
+
+function CarouselItem({item, isFocused, onPress}) {
+    const {translate} = useLocalize();
+    const {isAttachmentHidden} = useContext(ReportAttachmentsContext);
+    // eslint-disable-next-line es/no-nullish-coalescing-operators
+    const [isHidden, setIsHidden] = useState(isAttachmentHidden(item.reportActionID) ?? item.hasBeenFlagged);
+
+    const renderButton = (style) => (
+        <Button
+            small
+            style={style}
+            onPress={() => setIsHidden(!isHidden)}
+        >
+            <Text
+                style={styles.buttonSmallText}
+                selectable={false}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
+                {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
+            </Text>
+        </Button>
+    );
+
+    if (isHidden) {
+        const children = (
+            <>
+                <Text style={[styles.textLabelSupporting, styles.textAlignCenter, styles.lh20]}>{translate('moderation.flaggedContent')}</Text>
+                {renderButton([styles.mt2])}
+            </>
+        );
+        return onPress ? (
+            <PressableWithoutFeedback
+                style={[styles.attachmentRevealButtonContainer]}
+                onPress={onPress}
+                accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                accessibilityLabel={item.file.name || translate('attachmentView.unknownFilename')}
+            >
+                {children}
+            </PressableWithoutFeedback>
+        ) : (
+            <View style={[styles.attachmentRevealButtonContainer]}>{children}</View>
+        );
+    }
+
+    return (
+        <View style={[styles.flex1]}>
+            <View style={[styles.flex1]}>
+                <AttachmentView
+                    source={item.source}
+                    file={item.file}
+                    isAuthTokenRequired={item.isAuthTokenRequired}
+                    isFocused={isFocused}
+                    onPress={onPress}
+                    isUsedInCarousel
+                />
+            </View>
+
+            {item.hasBeenFlagged && (
+                <SafeAreaConsumer>
+                    {({safeAreaPaddingBottomStyle}) => <View style={[styles.appBG, safeAreaPaddingBottomStyle]}>{renderButton([styles.m4, styles.alignSelfCenter])}</View>}
+                </SafeAreaConsumer>
+            )}
+        </View>
+    );
+}
+
+CarouselItem.propTypes = propTypes;
+CarouselItem.defaultProps = defaultProps;
+
+export default CarouselItem;
diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
index b967d5ab0066..d5da25c89576 100644
--- a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
+++ b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
@@ -28,10 +28,12 @@ function extractAttachmentsFromReport(report, reportActions) {
             // By iterating actions in chronological order and prepending each attachment
             // we ensure correct order of attachments even across actions with multiple attachments.
             attachments.unshift({
+                reportActionID: attribs['data-id'],
                 source: tryResolveUrlFromApiRoot(expensifySource || attribs.src),
                 isAuthTokenRequired: Boolean(expensifySource),
                 file: {name: attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE]},
                 isReceipt: false,
+                hasBeenFlagged: attribs['data-flagged'] === 'true',
             });
         },
     });
@@ -62,7 +64,10 @@ function extractAttachmentsFromReport(report, reportActions) {
             }
         }
 
-        htmlParser.write(_.get(action, ['message', 0, 'html']));
+        const decision = _.get(action, ['message', 0, 'moderationDecision', 'decision'], '');
+        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
+        const html = _.get(action, ['message', 0, 'html'], '').replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
+        htmlParser.write(html);
     });
     htmlParser.end();
 
diff --git a/src/components/Attachments/AttachmentCarousel/index.js b/src/components/Attachments/AttachmentCarousel/index.js
index 53c2c840d95d..5c731a0ccfee 100644
--- a/src/components/Attachments/AttachmentCarousel/index.js
+++ b/src/components/Attachments/AttachmentCarousel/index.js
@@ -2,10 +2,8 @@ import React, {useRef, useCallback, useState, useEffect} from 'react';
 import {View, FlatList, PixelRatio, Keyboard} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
-import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 import styles from '../../../styles/styles';
 import CarouselActions from './CarouselActions';
-import AttachmentView from '../AttachmentView';
 import withWindowDimensions from '../../withWindowDimensions';
 import CarouselButtons from './CarouselButtons';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
@@ -15,12 +13,13 @@ import withLocalize from '../../withLocalize';
 import compose from '../../../libs/compose';
 import useCarouselArrows from './useCarouselArrows';
 import useWindowDimensions from '../../../hooks/useWindowDimensions';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
 import variables from '../../../styles/variables';
+import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 
-const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 const viewabilityConfig = {
     // To facilitate paging through the attachments, we want to consider an item "viewable" when it is
     // more than 95% visible. When that happens we update the page index in the state.
@@ -31,6 +30,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     const scrollRef = useRef(null);
 
     const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
     const [containerWidth, setContainerWidth] = useState(0);
     const [page, setPage] = useState(0);
@@ -99,7 +99,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
 
             scrollRef.current.scrollToIndex({index: nextIndex, animated: canUseTouchScreen});
         },
-        [attachments, page],
+        [attachments, canUseTouchScreen, page],
     );
 
     /**
@@ -143,24 +143,23 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     /**
      * Defines how a single attachment should be rendered
      * @param {Object} item
+     * @param {String} item.reportActionID
      * @param {Boolean} item.isAuthTokenRequired
      * @param {String} item.source
      * @param {Object} item.file
      * @param {String} item.file.name
+     * @param {Boolean} item.hasBeenFlagged
      * @returns {JSX.Element}
      */
     const renderItem = useCallback(
         ({item}) => (
-            <AttachmentView
-                source={item.source}
-                file={item.file}
-                isAuthTokenRequired={item.isAuthTokenRequired}
+            <CarouselItem
+                item={item}
                 isFocused={activeSource === item.source}
                 onPress={canUseTouchScreen ? () => setShouldShowArrows(!shouldShowArrows) : undefined}
-                isUsedInCarousel
             />
         ),
-        [activeSource, setShouldShowArrows, shouldShowArrows],
+        [activeSource, canUseTouchScreen, setShouldShowArrows, shouldShowArrows],
     );
 
     return (
diff --git a/src/components/Attachments/AttachmentCarousel/index.native.js b/src/components/Attachments/AttachmentCarousel/index.native.js
index 4162cfae88e9..95cda7c2f5c9 100644
--- a/src/components/Attachments/AttachmentCarousel/index.native.js
+++ b/src/components/Attachments/AttachmentCarousel/index.native.js
@@ -5,11 +5,11 @@ import _ from 'underscore';
 import AttachmentCarouselPager from './Pager';
 import styles from '../../../styles/styles';
 import CarouselButtons from './CarouselButtons';
-import AttachmentView from '../AttachmentView';
 import ONYXKEYS from '../../../ONYXKEYS';
 import {propTypes, defaultProps} from './attachmentCarouselPropTypes';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
 import useCarouselArrows from './useCarouselArrows';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
@@ -85,17 +85,14 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
 
     /**
      * Defines how a single attachment should be rendered
-     * @param {{ isAuthTokenRequired: Boolean, source: String, file: { name: String } }} item
+     * @param {{ reportActionID: String, isAuthTokenRequired: Boolean, source: String, file: { name: String }, hasBeenFlagged: Boolean }} item
      * @returns {JSX.Element}
      */
     const renderItem = useCallback(
         ({item}) => (
-            <AttachmentView
-                source={item.source}
-                file={item.file}
-                isAuthTokenRequired={item.isAuthTokenRequired}
+            <CarouselItem
+                item={item}
                 isFocused={activeSource === item.source}
-                isUsedInCarousel
                 onPress={() => setShouldShowArrows(!shouldShowArrows)}
             />
         ),
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
index f43a26ab94ee..64c97fa99819 100644
--- a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.js
@@ -2,9 +2,8 @@ import {useCallback, useEffect, useRef, useState} from 'react';
 import CONST from '../../../CONST';
 import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 
-const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
-
 function useCarouselArrows() {
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
     const [shouldShowArrows, setShouldShowArrowsInternal] = useState(canUseTouchScreen);
     const autoHideArrowTimeout = useRef(null);
 
@@ -25,7 +24,7 @@ function useCarouselArrows() {
         autoHideArrowTimeout.current = setTimeout(() => {
             setShouldShowArrowsInternal(false);
         }, CONST.ARROW_HIDE_DELAY);
-    }, [cancelAutoHideArrows]);
+    }, [canUseTouchScreen, cancelAutoHideArrows]);
 
     const setShouldShowArrows = useCallback(
         (show = true) => {
diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index ccc1643021ce..b8e24c199a73 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -14,11 +14,23 @@ const propTypes = {
     /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /* Onyx Props */
+    /** Collection of recently used categories attached to a policy */
+    policyRecentlyUsedCategories: PropTypes.arrayOf(PropTypes.string),
+
+    /* Onyx Props */
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: PropTypes.shape({
+        category: PropTypes.string.isRequired,
+    }),
 };
 
 const defaultProps = {
     policyID: '',
-    policyCategories: null,
+    policyCategories: {},
+    policyRecentlyUsedCategories: [],
+    iou: {},
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index 163ab6673ca2..91c7e82e7887 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -1,47 +1,88 @@
-import React, {useMemo} from 'react';
-import _ from 'underscore';
+import React, {useMemo, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import {propTypes, defaultProps} from './categoryPickerPropTypes';
-import OptionsList from '../OptionsList';
 import styles from '../../styles/styles';
-import ScreenWrapper from '../ScreenWrapper';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import CONST from '../../CONST';
+import * as IOU from '../../libs/actions/IOU';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import OptionsSelector from '../OptionsSelector';
+import useLocalize from '../../hooks/useLocalize';
+
+function CategoryPicker({policyCategories, reportID, iouType, iou, policyRecentlyUsedCategories}) {
+    const {translate} = useLocalize();
+    const [searchValue, setSearchValue] = useState('');
+
+    const policyCategoriesCount = _.size(policyCategories);
+    const isCategoriesCountBelowThreshold = policyCategoriesCount < CONST.CATEGORY_LIST_THRESHOLD;
 
-function CategoryPicker({policyCategories, reportID, iouType}) {
-    const sections = useMemo(() => {
-        const categoryList = _.chain(policyCategories)
-            .values()
-            .map((category) => ({
-                text: category.name,
-                keyForList: category.name,
-                tooltipText: category.name,
-            }))
-            .value();
+    const selectedOptions = useMemo(() => {
+        if (!iou.category) {
+            return [];
+        }
 
         return [
             {
-                data: categoryList,
+                name: iou.category,
+                enabled: true,
+                accountID: null,
             },
         ];
-    }, [policyCategories]);
+    }, [iou.category]);
+
+    const initialFocusedIndex = useMemo(() => {
+        if (isCategoriesCountBelowThreshold && selectedOptions.length > 0) {
+            return _.chain(policyCategories)
+                .values()
+                .findIndex((category) => category.name === selectedOptions[0].name, true)
+                .value();
+        }
+
+        return 0;
+    }, [policyCategories, selectedOptions, isCategoriesCountBelowThreshold]);
+
+    const sections = useMemo(
+        () => OptionsListUtils.getNewChatOptions({}, {}, [], searchValue, selectedOptions, [], false, false, true, policyCategories, policyRecentlyUsedCategories, false).categoryOptions,
+        [policyCategories, policyRecentlyUsedCategories, searchValue, selectedOptions],
+    );
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, searchValue);
+    const shouldShowTextInput = !isCategoriesCountBelowThreshold;
 
     const navigateBack = () => {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
     };
 
+    const updateCategory = (category) => {
+        if (category.searchText === iou.category) {
+            IOU.resetMoneyRequestCategory();
+        } else {
+            IOU.setMoneyRequestCategory(category.searchText);
+        }
+
+        navigateBack();
+    };
+
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({safeAreaPaddingBottomStyle}) => (
-                <OptionsList
-                    optionHoveredStyle={styles.hoveredComponentBG}
-                    contentContainerStyles={[safeAreaPaddingBottomStyle]}
-                    sections={sections}
-                    onSelectRow={navigateBack}
-                />
-            )}
-        </ScreenWrapper>
+        <OptionsSelector
+            optionHoveredStyle={styles.hoveredComponentBG}
+            sections={sections}
+            selectedOptions={selectedOptions}
+            value={searchValue}
+            initialFocusedIndex={initialFocusedIndex}
+            headerMessage={headerMessage}
+            shouldShowTextInput={shouldShowTextInput}
+            textInputLabel={translate('common.search')}
+            boldStyle
+            highlightSelectedOptions
+            isRowMultilineSupported
+            onChangeText={setSearchValue}
+            onSelectRow={updateCategory}
+        />
     );
 }
 
@@ -53,4 +94,10 @@ export default withOnyx({
     policyCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
     },
+    policyRecentlyUsedCategories: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`,
+    },
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
 })(CategoryPicker);
diff --git a/src/components/ConfirmedRoute.js b/src/components/ConfirmedRoute.js
index 6790e8ae4d65..4bcdc4738a3c 100644
--- a/src/components/ConfirmedRoute.js
+++ b/src/components/ConfirmedRoute.js
@@ -16,7 +16,7 @@ import transactionPropTypes from './transactionPropTypes';
 import BlockingView from './BlockingViews/BlockingView';
 import useNetwork from '../hooks/useNetwork';
 import useLocalize from '../hooks/useLocalize';
-import MapView from './MapView';
+import DistanceMapView from './DistanceMapView';
 
 const propTypes = {
     /** Transaction that stores the distance request data */
@@ -90,7 +90,7 @@ function ConfirmedRoute({mapboxAccessToken, transaction}) {
     return (
         <>
             {!isOffline && Boolean(mapboxAccessToken.token) ? (
-                <MapView
+                <DistanceMapView
                     accessToken={mapboxAccessToken.token}
                     mapPadding={CONST.MAP_PADDING}
                     pitchEnabled={false}
diff --git a/src/components/CountryPicker/CountrySelectorModal.js b/src/components/CountryPicker/CountrySelectorModal.js
index e6ed1a77ce85..ac543d9921d2 100644
--- a/src/components/CountryPicker/CountrySelectorModal.js
+++ b/src/components/CountryPicker/CountrySelectorModal.js
@@ -49,13 +49,16 @@ function CountrySelectorModal({currentCountry, isVisible, onClose, onCountrySele
 
     const countries = useMemo(
         () =>
-            _.map(translate('allCountries'), (countryName, countryISO) => ({
-                value: countryISO,
-                keyForList: countryISO,
-                text: countryName,
-                isSelected: currentCountry === countryISO,
-                searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),
-            })),
+            _.map(_.keys(CONST.ALL_COUNTRIES), (countryISO) => {
+                const countryName = translate(`allCountries.${countryISO}`);
+                return {
+                    value: countryISO,
+                    keyForList: countryISO,
+                    text: countryName,
+                    isSelected: currentCountry === countryISO,
+                    searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),
+                };
+            }),
         [translate, currentCountry],
     );
 
diff --git a/src/components/CountryPicker/index.js b/src/components/CountryPicker/index.js
index c6bbae0dd645..c838ed8f4060 100644
--- a/src/components/CountryPicker/index.js
+++ b/src/components/CountryPicker/index.js
@@ -31,7 +31,6 @@ const defaultProps = {
 
 function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
     const {translate} = useLocalize();
-    const allCountries = translate('allCountries');
     const [isPickerVisible, setIsPickerVisible] = useState(false);
     const [searchValue, setSearchValue] = useState('');
 
@@ -48,7 +47,7 @@ function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
         hidePickerModal();
     };
 
-    const title = allCountries[value] || '';
+    const title = value ? translate(`allCountries.${value}`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
diff --git a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
index e31429af61b6..61614c7e49e6 100644
--- a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
+++ b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
@@ -7,7 +7,7 @@ import Text from '../Text';
 import Icon from '../Icon';
 import * as Illustrations from '../Icon/Illustrations';
 import * as Expensicons from '../Icon/Expensicons';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
@@ -56,7 +56,7 @@ function DeeplinkRedirectLoadingIndicator({translate, openLinkInBrowser, session
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/DistanceMapView/distanceMapViewPropTypes.js b/src/components/DistanceMapView/distanceMapViewPropTypes.js
new file mode 100644
index 000000000000..05068cbc9b34
--- /dev/null
+++ b/src/components/DistanceMapView/distanceMapViewPropTypes.js
@@ -0,0 +1,55 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    // Public access token to be used to fetch map data from Mapbox.
+    accessToken: PropTypes.string.isRequired,
+
+    // Style applied to MapView component. Note some of the View Style props are not available on ViewMap
+    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
+    // Link to the style JSON document.
+    styleURL: PropTypes.string,
+
+    // Whether map can tilt in the vertical direction.
+    pitchEnabled: PropTypes.bool,
+
+    // Padding to apply when the map is adjusted to fit waypoints and directions
+    mapPadding: PropTypes.number,
+
+    // Initial coordinate and zoom level
+    initialState: PropTypes.shape({
+        location: PropTypes.arrayOf(PropTypes.number).isRequired,
+        zoom: PropTypes.number.isRequired,
+    }),
+
+    // Locations on which to put markers
+    waypoints: PropTypes.arrayOf(
+        PropTypes.shape({
+            id: PropTypes.string,
+            coordinate: PropTypes.arrayOf(PropTypes.number),
+            markerComponent: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
+        }),
+    ),
+
+    // List of coordinates which together forms a direction.
+    directionCoordinates: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
+
+    // Callback to call when the map is idle / ready
+    onMapReady: PropTypes.func,
+
+    // Optional additional styles to be applied to the overlay
+    overlayStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+};
+
+const defaultProps = {
+    styleURL: undefined,
+    pitchEnabled: false,
+    mapPadding: 0,
+    initialState: undefined,
+    waypoints: undefined,
+    directionCoordinates: undefined,
+    onMapReady: () => {},
+    overlayStyle: undefined,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/DistanceMapView/index.android.js b/src/components/DistanceMapView/index.android.js
new file mode 100644
index 000000000000..ea72fb4de299
--- /dev/null
+++ b/src/components/DistanceMapView/index.android.js
@@ -0,0 +1,48 @@
+import React, {useState} from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import BlockingView from '../BlockingViews/BlockingView';
+import MapView from '../MapView';
+import styles from '../../styles/styles';
+import useNetwork from '../../hooks/useNetwork';
+import useLocalize from '../../hooks/useLocalize';
+import * as Expensicons from '../Icon/Expensicons';
+import * as StyleUtils from '../../styles/StyleUtils';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    const [isMapReady, setIsMapReady] = useState(false);
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    return (
+        <>
+            <MapView
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {..._.omit(props, 'overlayStyle')}
+                onMapReady={() => {
+                    if (isMapReady) {
+                        return;
+                    }
+                    setIsMapReady(true);
+                }}
+            />
+            {!isMapReady && (
+                <View style={StyleUtils.combineStyles(styles.mapViewOverlay, props.overlayStyle)}>
+                    <BlockingView
+                        icon={Expensicons.EmptyStateRoutePending}
+                        title={translate('distance.mapPending.title')}
+                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                        shouldShowLink={false}
+                    />
+                </View>
+            )}
+        </>
+    );
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceMapView/index.js b/src/components/DistanceMapView/index.js
new file mode 100644
index 000000000000..24bdf99382d1
--- /dev/null
+++ b/src/components/DistanceMapView/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import _ from 'underscore';
+import MapView from '../MapView';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return <MapView {..._.omit(props, 'overlayStyle')} />;
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index e0d8e8b642f6..bf5a4cb9548b 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -26,9 +26,10 @@ import Navigation from '../libs/Navigation/Navigation';
 import * as MapboxToken from '../libs/actions/MapboxToken';
 import * as Transaction from '../libs/actions/Transaction';
 import * as TransactionUtils from '../libs/TransactionUtils';
+import * as IOUUtils from '../libs/IOUUtils';
 
 import Button from './Button';
-import MapView from './MapView';
+import DistanceMapView from './DistanceMapView';
 import LinearGradient from './LinearGradient';
 import * as Expensicons from './Icon/Expensicons';
 import BlockingView from './BlockingViews/BlockingView';
@@ -38,6 +39,9 @@ import {iouPropTypes} from '../pages/iou/propTypes';
 import reportPropTypes from '../pages/reportPropTypes';
 import * as IOU from '../libs/actions/IOU';
 import * as StyleUtils from '../styles/StyleUtils';
+import ScreenWrapper from './ScreenWrapper';
+import FullPageNotFoundView from './BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from './HeaderWithBackButton';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
@@ -63,6 +67,18 @@ const propTypes = {
         /** Time when the token will expire in ISO 8601 */
         expiration: PropTypes.string,
     }),
+
+    /** React Navigation route */
+    route: PropTypes.shape({
+        /** Params from the route */
+        params: PropTypes.shape({
+            /** The type of IOU report, i.e. bill, request, send */
+            iouType: PropTypes.string,
+
+            /** The report ID of the IOU */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
 };
 
 const defaultProps = {
@@ -75,13 +91,14 @@ const defaultProps = {
     },
 };
 
-function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken}) {
+function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken, route}) {
     const [shouldShowGradient, setShouldShowGradient] = useState(false);
     const [scrollContainerHeight, setScrollContainerHeight] = useState(0);
     const [scrollContentHeight, setScrollContentHeight] = useState(0);
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
 
+    const isEditing = lodashGet(route, 'path', '').includes('address');
     const reportID = lodashGet(report, 'reportID', '');
     const waypoints = useMemo(() => lodashGet(transaction, 'comment.waypoints', {}), [transaction]);
     const previousWaypoints = usePrevious(waypoints);
@@ -161,21 +178,36 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
         Transaction.getRoute(iou.transactionID, validatedWaypoints);
     }, [shouldFetchRoute, iou.transactionID, validatedWaypoints, isOffline]);
 
+    useEffect(() => {
+        if (numberOfWaypoints <= numberOfPreviousWaypoints) {
+            return;
+        }
+        scrollViewRef.current.scrollToEnd({animated: true});
+    }, [numberOfPreviousWaypoints, numberOfWaypoints]);
+
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
-    return (
+    const navigateBack = () => {
+        Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null);
+    };
+
+    const navigateToNextPage = () => {
+        if (isEditing) {
+            Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+            return;
+        }
+
+        IOU.navigateToNextPage(iou, iouType, reportID, report);
+    };
+
+    const content = (
         <ScrollView contentContainerStyle={styles.flexGrow1}>
             <View
                 style={styles.distanceRequestContainer(scrollContainerMaxHeight)}
                 onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))}
             >
                 <ScrollView
-                    onContentSizeChange={(width, height) => {
-                        if (scrollContentHeight < height && numberOfWaypoints > numberOfPreviousWaypoints) {
-                            scrollViewRef.current.scrollToEnd({animated: true});
-                        }
-                        setScrollContentHeight(height);
-                    }}
+                    onContentSizeChange={(width, height) => setScrollContentHeight(height)}
                     onScroll={updateGradientVisibility}
                     scrollEventThrottle={variables.distanceScrollEventThrottle}
                     ref={scrollViewRef}
@@ -236,7 +268,7 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
             </View>
             <View style={styles.mapViewContainer}>
                 {!isOffline && Boolean(mapboxAccessToken.token) ? (
-                    <MapView
+                    <DistanceMapView
                         accessToken={mapboxAccessToken.token}
                         mapPadding={CONST.MAPBOX.PADDING}
                         pitchEnabled={false}
@@ -248,6 +280,7 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
                         style={styles.mapView}
                         waypoints={waypointMarkers}
                         styleURL={CONST.MAPBOX.STYLE_URL}
+                        overlayStyle={styles.m4}
                     />
                 ) : (
                     <View style={[styles.mapPendingView]}>
@@ -263,12 +296,35 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
             <Button
                 success
                 style={[styles.w100, styles.mb4, styles.ph4, styles.flexShrink0]}
-                onPress={() => IOU.navigateToNextPage(iou, iouType, reportID, report)}
+                onPress={navigateToNextPage}
                 isDisabled={_.size(validatedWaypoints) < 2 || hasRouteError || isOffline}
                 text={translate('common.next')}
             />
         </ScrollView>
     );
+
+    if (!isEditing) {
+        return content;
+    }
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableKeyboardAvoidingView={false}
+        >
+            {({safeAreaPaddingBottomStyle}) => (
+                <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType)}>
+                    <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
+                        <HeaderWithBackButton
+                            title={translate('common.distance')}
+                            onBackButonBackButtonPress={navigateBack}
+                        />
+                        {content}
+                    </View>
+                </FullPageNotFoundView>
+            )}
+        </ScreenWrapper>
+    );
 }
 
 DistanceRequest.displayName = 'DistanceRequest';
diff --git a/src/components/DotIndicatorMessage.js b/src/components/DotIndicatorMessage.js
index ac550f34de3f..b3528b43dc75 100644
--- a/src/components/DotIndicatorMessage.js
+++ b/src/components/DotIndicatorMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import styles from '../styles/styles';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Text from './Text';
 import * as Localize from '../libs/Localize';
 
@@ -57,7 +57,7 @@ function DotIndicatorMessage(props) {
             <View style={styles.offlineFeedback.errorDot}>
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={props.type === 'error' ? colors.red : colors.green}
+                    fill={props.type === 'error' ? themeColors.danger : themeColors.success}
                 />
             </View>
             <View style={styles.offlineFeedback.textContainer}>
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index 61f6981edbbe..d3268ebc54b0 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -21,7 +21,6 @@ import * as EmojiUtils from '../../../libs/EmojiUtils';
 import CategoryShortcutBar from '../CategoryShortcutBar';
 import TextInput from '../../TextInput';
 import isEnterWhileComposition from '../../../libs/KeyboardShortcut/isEnterWhileComposition';
-import canFocusInputOnScreenFocus from '../../../libs/canFocusInputOnScreenFocus';
 
 const propTypes = {
     /** Function to add the selected emoji to the main compose text input */
@@ -59,10 +58,6 @@ class EmojiPickerMenu extends Component {
         // Ref for emoji FlatList
         this.emojiList = undefined;
 
-        // We want consistent auto focus behavior on input between native and mWeb so we have some auto focus management code that will
-        // prevent auto focus when open picker for mobile device
-        this.shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus();
-
         this.filterEmojis = _.debounce(this.filterEmojis.bind(this), 300);
         this.highlightAdjacentEmoji = this.highlightAdjacentEmoji.bind(this);
         this.setupEventHandlers = this.setupEventHandlers.bind(this);
@@ -101,7 +96,7 @@ class EmojiPickerMenu extends Component {
         // get a ref to the inner textInput element e.g. if we do
         // <constructor ref={el => this.textInput = el} /> this will not
         // return a ref to the component, but rather the HTML element by default
-        if (this.shouldFocusInputOnScreenFocus && this.props.forwardedRef && _.isFunction(this.props.forwardedRef)) {
+        if (this.props.forwardedRef && _.isFunction(this.props.forwardedRef)) {
             this.props.forwardedRef(this.searchInput);
         }
         this.setupEventHandlers();
@@ -507,7 +502,6 @@ class EmojiPickerMenu extends Component {
                         onChangeText={this.filterEmojis}
                         defaultValue=""
                         ref={(el) => (this.searchInput = el)}
-                        autoFocus={this.shouldFocusInputOnScreenFocus}
                         selectTextOnFocus={this.state.selectTextOnFocus}
                         onSelectionChange={this.onSelectionChange}
                         onFocus={() => this.setState({isFocused: true, highlightedIndex: -1, isUsingKeyboardMovement: false})}
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
index bfdaf1c13d1b..5cd956dae56b 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.js
@@ -25,6 +25,9 @@ const propTypes = {
     /** Function to add the selected emoji to the main compose text input */
     onEmojiSelected: PropTypes.func.isRequired,
 
+    /** The ref to the search input (may be null on small screen widths) */
+    forwardedRef: PropTypes.func,
+
     /** Stores user's preferred skin tone */
     preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 
@@ -37,11 +40,12 @@ const propTypes = {
 };
 
 const defaultProps = {
+    forwardedRef: () => {},
     preferredSkinTone: CONST.EMOJI_DEFAULT_SKIN_TONE,
     frequentlyUsedEmojis: [],
 };
 
-function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, translate, frequentlyUsedEmojis}) {
+function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, translate, frequentlyUsedEmojis, forwardedRef}) {
     const emojiList = useAnimatedRef();
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const allEmojis = useMemo(() => EmojiUtils.mergeEmojisWithFrequentlyUsedEmojis(emojis), [frequentlyUsedEmojis]);
@@ -168,6 +172,7 @@ function EmojiPickerMenu({preferredLocale, onEmojiSelected, preferredSkinTone, t
                     accessibilityLabel={translate('common.search')}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                     onChangeText={filterEmojis}
+                    ref={forwardedRef}
                 />
             </View>
             {!isFiltered && (
diff --git a/src/components/FocusTrapView/index.js b/src/components/FocusTrapView/index.js
new file mode 100644
index 000000000000..2dcab7b9d998
--- /dev/null
+++ b/src/components/FocusTrapView/index.js
@@ -0,0 +1,75 @@
+/*
+ * The FocusTrap is only used on web and desktop
+ */
+import React, {useEffect, useRef} from 'react';
+import FocusTrap from 'focus-trap-react';
+import {View} from 'react-native';
+import {PropTypes} from 'prop-types';
+import {useIsFocused} from '@react-navigation/native';
+
+const propTypes = {
+    /** Children to wrap with FocusTrap */
+    children: PropTypes.node.isRequired,
+
+    /** Whether to enable the FocusTrap */
+    enabled: PropTypes.bool,
+
+    /**
+     *  Whether to disable auto focus
+     *  It is used when the component inside the FocusTrap have their own auto focus logic
+     */
+    shouldEnableAutoFocus: PropTypes.bool,
+};
+
+const defaultProps = {
+    enabled: true,
+    shouldEnableAutoFocus: false,
+};
+
+function FocusTrapView({enabled, shouldEnableAutoFocus, ...props}) {
+    const isFocused = useIsFocused();
+
+    /**
+     * Focus trap always needs a focusable element.
+     * In case that we don't have any focusable elements in the modal,
+     * the FocusTrap will use fallback View element using this ref.
+     */
+    const ref = useRef(null);
+
+    /**
+     * We have to set the 'tabindex' attribute to 0 to make the View focusable.
+     * Currently, it is not possible to set this through props.
+     * After the upgrade of 'react-native-web' to version 0.19 we can use 'tabIndex={0}' prop instead.
+     */
+    useEffect(() => {
+        if (!ref.current) {
+            return;
+        }
+        ref.current.setAttribute('tabindex', '0');
+    }, []);
+
+    return enabled ? (
+        <FocusTrap
+            active={isFocused}
+            focusTrapOptions={{
+                initialFocus: () => shouldEnableAutoFocus && ref.current,
+                fallbackFocus: () => ref.current,
+                clickOutsideDeactivates: true,
+            }}
+        >
+            <View
+                ref={ref}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+            />
+        </FocusTrap>
+    ) : (
+        props.children
+    );
+}
+
+FocusTrapView.displayName = 'FocusTrapView';
+FocusTrapView.propTypes = propTypes;
+FocusTrapView.defaultProps = defaultProps;
+
+export default FocusTrapView;
diff --git a/src/components/FocusTrapView/index.native.js b/src/components/FocusTrapView/index.native.js
new file mode 100644
index 000000000000..5720601f5a2b
--- /dev/null
+++ b/src/components/FocusTrapView/index.native.js
@@ -0,0 +1,11 @@
+/*
+ * The FocusTrap is only used on web and desktop
+ */
+
+function FocusTrapView({children}) {
+    return children;
+}
+
+FocusTrapView.displayName = 'FocusTrapView';
+
+export default FocusTrapView;
diff --git a/src/components/Form.js b/src/components/Form.js
index 95c53b29e18d..ef6c3ea10474 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -140,11 +140,15 @@ function Form(props) {
 
             // Validate the input for html tags. It should supercede any other error
             _.each(trimmedStringValues, (inputValue, inputID) => {
+                // If the input value is empty OR is non-string, we don't need to validate it for HTML tags
+                if (!inputValue || !_.isString(inputValue)) {
+                    return;
+                }
                 const foundHtmlTagIndex = inputValue.search(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
                 const leadingSpaceIndex = inputValue.search(CONST.VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX);
 
-                // Return early if there is no value OR the value is not a string OR there are no HTML characters
-                if (!inputValue || !_.isString(inputValue) || (leadingSpaceIndex === -1 && foundHtmlTagIndex === -1)) {
+                // Return early if there are no HTML characters
+                if (leadingSpaceIndex === -1 && foundHtmlTagIndex === -1) {
                     return;
                 }
 
diff --git a/src/components/FormHelpMessage.js b/src/components/FormHelpMessage.js
index df8befe5af30..f7366f8dfef6 100644
--- a/src/components/FormHelpMessage.js
+++ b/src/components/FormHelpMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import styles from '../styles/styles';
 import stylePropTypes from '../styles/stylePropTypes';
 import * as Localize from '../libs/Localize';
@@ -42,7 +42,7 @@ function FormHelpMessage(props) {
             {props.isError && (
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={colors.red}
+                    fill={themeColors.danger}
                 />
             )}
             <View style={[styles.flex1, props.isError && styles.ml2]}>
diff --git a/src/components/GrowlNotification/index.js b/src/components/GrowlNotification/index.js
index 60bd1bf00587..70cadd5efd8e 100644
--- a/src/components/GrowlNotification/index.js
+++ b/src/components/GrowlNotification/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import {Directions, FlingGestureHandler, State} from 'react-native-gesture-handler';
 import {View, Animated} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import Text from '../Text';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
@@ -14,15 +14,15 @@ import * as Pressables from '../Pressable';
 const types = {
     [CONST.GROWL.SUCCESS]: {
         icon: Expensicons.Checkmark,
-        iconColor: colors.green,
+        iconColor: themeColors.success,
     },
     [CONST.GROWL.ERROR]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.red,
+        iconColor: themeColors.danger,
     },
     [CONST.GROWL.WARNING]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.yellow,
+        iconColor: themeColors.warning,
     },
 };
 
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
index bfe39459ed74..74cf83a4a6f0 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
@@ -1,4 +1,6 @@
-import React from 'react';
+import React, {memo} from 'react';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import Navigation from '../../../libs/Navigation/Navigation';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import styles from '../../../styles/styles';
@@ -8,12 +10,15 @@ import CONST from '../../../CONST';
 import {ShowContextMenuContext, showContextMenuForReport} from '../../ShowContextMenuContext';
 import tryResolveUrlFromApiRoot from '../../../libs/tryResolveUrlFromApiRoot';
 import * as ReportUtils from '../../../libs/ReportUtils';
-import withLocalize, {withLocalizePropTypes} from '../../withLocalize';
 import ROUTES from '../../../ROUTES';
+import ONYXKEYS from '../../../ONYXKEYS';
+import useLocalize from '../../../hooks/useLocalize';
 
-const propTypes = {...htmlRendererPropTypes, ...withLocalizePropTypes};
+const propTypes = {...htmlRendererPropTypes};
 
 function ImageRenderer(props) {
+    const {translate} = useLocalize();
+
     const htmlAttribs = props.tnode.attributes;
 
     // There are two kinds of images that need to be displayed:
@@ -72,7 +77,7 @@ function ImageRenderer(props) {
                         )
                     }
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                    accessibilityLabel={props.translate('accessibilityHints.viewAttachment')}
+                    accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                 >
                     <ThumbnailImage
                         previewSourceURL={previewSource}
@@ -90,4 +95,15 @@ function ImageRenderer(props) {
 ImageRenderer.propTypes = propTypes;
 ImageRenderer.displayName = 'ImageRenderer';
 
-export default withLocalize(ImageRenderer);
+export default withOnyx({
+    user: {
+        key: ONYXKEYS.USER,
+    },
+})(
+    memo(
+        ImageRenderer,
+        (prevProps, nextProps) =>
+            lodashGet(prevProps, 'tnode.attributes') === lodashGet(nextProps, 'tnode.attributes') &&
+            lodashGet(prevProps, 'user.shouldUseStagingServer') === lodashGet(nextProps, 'user.shouldUseStagingServer'),
+    ),
+);
diff --git a/src/components/KeyboardShortcutsModal.js b/src/components/KeyboardShortcutsModal.js
index 9d78a22b5aa8..6ca3cce6412c 100644
--- a/src/components/KeyboardShortcutsModal.js
+++ b/src/components/KeyboardShortcutsModal.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import PropTypes from 'prop-types';
 import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -41,7 +41,7 @@ const openShortcutModalConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUT_MODAL;
 function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidth, translate}) {
     const subscribedOpenModalShortcuts = useRef([]);
     const modalType = isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE;
-    const shortcuts = KeyboardShortcut.getDocumentedShortcuts();
+    const [shortcuts, setShortcurts] = useState([]);
 
     /*
      * Subscribe shortcuts that only are used when the modal is open
@@ -79,6 +79,7 @@ function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidt
             KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, () => {}, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true),
             KeyboardShortcut.subscribe(arrowDownConfig.shortcutKey, () => {}, arrowDownConfig.descriptionKey, arrowDownConfig.modifiers, true),
         ];
+        setShortcurts(KeyboardShortcut.getDocumentedShortcuts());
     };
 
     /*
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 95b1fc0f801e..f5a293701454 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -12,7 +12,6 @@ import * as Expensicons from '../Icon/Expensicons';
 import MultipleAvatars from '../MultipleAvatars';
 import Hoverable from '../Hoverable';
 import DisplayNames from '../DisplayNames';
-import colors from '../../styles/colors';
 import Text from '../Text';
 import SubscriptAvatar from '../SubscriptAvatar';
 import CONST from '../../CONST';
@@ -121,7 +120,8 @@ function OptionRowLHN(props) {
             '',
             popoverAnchor,
             props.reportID,
-            {},
+            '0',
+            props.reportID,
             '',
             () => {},
             () => setIsContextMenuActive(false),
@@ -245,7 +245,7 @@ function OptionRowLHN(props) {
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                         <Icon
                                             src={Expensicons.DotIndicator}
-                                            fill={colors.red}
+                                            fill={themeColors.danger}
                                         />
                                     </View>
                                 )}
@@ -256,10 +256,12 @@ function OptionRowLHN(props) {
                             accessible={false}
                         >
                             {shouldShowGreenDotIndicator && (
-                                <Icon
-                                    src={Expensicons.DotIndicator}
-                                    fill={themeColors.success}
-                                />
+                                <View style={styles.ml2}>
+                                    <Icon
+                                        src={Expensicons.DotIndicator}
+                                        fill={themeColors.success}
+                                    />
+                                </View>
                             )}
                             {optionItem.hasDraftComment && optionItem.isAllowedToComment && (
                                 <View
diff --git a/src/components/LHNOptionsList/OptionRowLHNData.js b/src/components/LHNOptionsList/OptionRowLHNData.js
index 4c7bd54efa18..2c51d6332946 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.js
+++ b/src/components/LHNOptionsList/OptionRowLHNData.js
@@ -33,21 +33,25 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     fullReport: PropTypes.object,
 
-    /** The policies which the user has access to and which the report could be tied to */
-    policies: PropTypes.objectOf(
-        PropTypes.shape({
-            /** The ID of the policy */
-            id: PropTypes.string,
-            /** Name of the policy */
-            name: PropTypes.string,
-            /** Avatar of the policy */
-            avatar: PropTypes.string,
-        }),
-    ),
+    /** The policy which the user has access to and which the report could be tied to */
+    policy: PropTypes.shape({
+        /** The ID of the policy */
+        id: PropTypes.string,
+        /** Name of the policy */
+        name: PropTypes.string,
+        /** Avatar of the policy */
+        avatar: PropTypes.string,
+    }),
 
     /** The actions from the parent report */
     parentReportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
 
+    /** The transaction from the parent report action */
+    transaction: PropTypes.shape({
+        /** The ID of the transaction */
+        transactionID: PropTypes.string,
+    }),
+
     ...withCurrentReportIDPropTypes,
     ...basePropTypes,
 };
@@ -56,8 +60,9 @@ const defaultProps = {
     shouldDisableFocusOptions: false,
     personalDetails: {},
     fullReport: {},
-    policies: {},
+    policy: {},
     parentReportActions: {},
+    transaction: {},
     preferredLocale: CONST.LOCALES.DEFAULT,
     ...withCurrentReportIDDefaultProps,
     ...baseDefaultProps,
@@ -77,9 +82,10 @@ function OptionRowLHNData({
     personalDetails,
     preferredLocale,
     comment,
-    policies,
+    policy,
     receiptTransactions,
     parentReportActions,
+    transaction,
     ...propsToForward
 }) {
     const reportID = propsToForward.reportID;
@@ -87,8 +93,6 @@ function OptionRowLHNData({
     // instead of a changing number (so we prevent unnecessary re-renders).
     const isFocused = !shouldDisableFocusOptions && currentReportID === reportID;
 
-    const policy = lodashGet(policies, [`${ONYXKEYS.COLLECTION.POLICY}${fullReport.policyID}`], '');
-
     const parentReportAction = parentReportActions[fullReport.parentReportActionID];
 
     const optionItemRef = useRef();
@@ -109,8 +113,9 @@ function OptionRowLHNData({
         optionItemRef.current = item;
         return item;
         // Listen parentReportAction to update title of thread report when parentReportAction changed
+        // Listen to transaction to update title of transaction report when transaction changed
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [fullReport, linkedTransaction, reportActions, personalDetails, preferredLocale, policy, parentReportAction]);
+    }, [fullReport, linkedTransaction, reportActions, personalDetails, preferredLocale, policy, parentReportAction, transaction]);
 
     useEffect(() => {
         if (!optionItem || optionItem.hasDraftComment || !comment || comment.length <= 0 || isFocused) {
@@ -189,20 +194,26 @@ export default React.memo(
             preferredLocale: {
                 key: ONYXKEYS.NVP_PREFERRED_LOCALE,
             },
-            policies: {
-                key: ONYXKEYS.COLLECTION.POLICY,
-            },
         }),
         withOnyx({
             parentReportActions: {
                 key: ({fullReport}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fullReport.parentReportID}`,
                 canEvict: false,
             },
+            policy: {
+                key: ({fullReport}) => `${ONYXKEYS.COLLECTION.POLICY}${fullReport.policyID}`,
+            },
             // Ideally, we aim to access only the last transaction for the current report by listening to changes in reportActions.
             // In some scenarios, a transaction might be created after reportActions have been modified.
             // This can lead to situations where `lastTransaction` doesn't update and retains the previous value.
             // However, performance overhead of this is minimized by using memos inside the component.
             receiptTransactions: {key: ONYXKEYS.COLLECTION.TRANSACTION},
         }),
+        withOnyx({
+            transaction: {
+                key: ({fullReport, parentReportActions}) =>
+                    `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportActions, [fullReport.parentReportActionID, 'originalMessage', 'IOUTransactionID'], '')}`,
+            },
+        }),
     )(OptionRowLHNData),
 );
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
index 532c29535e50..435f88e51e53 100644
--- a/src/components/LocalePicker.js
+++ b/src/components/LocalePicker.js
@@ -27,9 +27,11 @@ const defaultProps = {
 };
 
 function LocalePicker(props) {
-    const localesToLanguages = _.map(props.translate('languagePage.languages'), (language, key) => ({
-        value: key,
-        label: language.label,
+    const localesToLanguages = _.map(CONST.LANGUAGES, (language) => ({
+        value: language,
+        label: props.translate(`languagePage.languages.${language}.label`),
+        keyForList: language,
+        isSelected: props.preferredLocale === language,
     }));
     return (
         <Picker
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index aebd63edf559..7a2248ffafb9 100644
--- a/src/components/MapView/MapView.tsx
+++ b/src/components/MapView/MapView.tsx
@@ -2,6 +2,7 @@ import {View} from 'react-native';
 import {useFocusEffect} from '@react-navigation/native';
 import Mapbox, {MapState, MarkerView, setAccessToken} from '@rnmapbox/maps';
 import {forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import styles from '../../styles/styles';
 
 import responder from './responder';
 import utils from './utils';
@@ -10,7 +11,7 @@ import CONST from '../../CONST';
 
 import {MapViewProps, MapViewHandle} from './MapViewTypes';
 
-const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, mapPadding, styleURL, pitchEnabled, initialState, waypoints, directionCoordinates}, ref) => {
+const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, mapPadding, styleURL, pitchEnabled, initialState, waypoints, directionCoordinates, onMapReady}, ref) => {
     const cameraRef = useRef<Mapbox.Camera>(null);
     const [isIdle, setIsIdle] = useState(false);
 
@@ -55,6 +56,9 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, ma
     const setMapIdle = (e: MapState) => {
         if (e.gestures.isGestureActive) return;
         setIsIdle(true);
+        if (onMapReady) {
+            onMapReady();
+        }
     };
 
     return (
@@ -64,6 +68,8 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, ma
                 styleURL={styleURL}
                 onMapIdle={setMapIdle}
                 pitchEnabled={pitchEnabled}
+                attributionPosition={{...styles.r2, ...styles.b2}}
+                logoPosition={{...styles.l2, ...styles.b2}}
                 // eslint-disable-next-line
                 {...responder.panHandlers}
             >
diff --git a/src/components/MapView/MapViewTypes.ts b/src/components/MapView/MapViewTypes.ts
index cf5abeed02b2..de32528d077e 100644
--- a/src/components/MapView/MapViewTypes.ts
+++ b/src/components/MapView/MapViewTypes.ts
@@ -18,6 +18,8 @@ type MapViewProps = {
     waypoints?: WayPoint[];
     // List of coordinates which together forms a direction.
     directionCoordinates?: Array<[number, number]>;
+    // Callback to call when the map is idle / ready.
+    onMapReady?: () => void;
 };
 
 type DirectionProps = {
diff --git a/src/components/MentionSuggestions.js b/src/components/MentionSuggestions.js
index 4b0129635269..11df8a597ded 100644
--- a/src/components/MentionSuggestions.js
+++ b/src/components/MentionSuggestions.js
@@ -3,6 +3,7 @@ import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import styles from '../styles/styles';
+import themeColors from '../styles/themes/default';
 import * as StyleUtils from '../styles/StyleUtils';
 import Text from './Text';
 import CONST from '../CONST';
@@ -79,7 +80,7 @@ function MentionSuggestions(props) {
                         size={isIcon ? CONST.AVATAR_SIZE.MENTION_ICON : CONST.AVATAR_SIZE.SMALLER}
                         name={item.icons[0].name}
                         type={item.icons[0].type}
-                        fill={styles.success}
+                        fill={themeColors.success}
                     />
                 </View>
                 <Text
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index adf3fa0cdd80..c39c1d503258 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -14,7 +14,6 @@ import Badge from './Badge';
 import CONST from '../CONST';
 import menuItemPropTypes from './menuItemPropTypes';
 import SelectCircle from './SelectCircle';
-import colors from '../styles/colors';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
 import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
@@ -298,7 +297,7 @@ const MenuItem = React.forwardRef((props, ref) => {
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.ml1]}>
                                         <Icon
                                             src={Expensicons.DotIndicator}
-                                            fill={props.brickRoadIndicator === 'error' ? colors.red : colors.green}
+                                            fill={props.brickRoadIndicator === 'error' ? themeColors.danger : themeColors.success}
                                         />
                                     </View>
                                 )}
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 7e6cc78ebd13..06a7f0b57b8e 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -69,8 +69,8 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(
-        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0,
-        [isPayer, isSettled, moneyRequestReport, reportTotal],
+        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0 && !ReportUtils.isArchivedRoom(chatReport),
+        [isPayer, isSettled, moneyRequestReport, reportTotal, chatReport],
     );
     const shouldShowApproveButton = useMemo(() => {
         if (policyType !== CONST.POLICY.TYPE.CORPORATE) {
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index a7695c939907..da98d324681e 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -8,6 +8,7 @@ import lodashGet from 'lodash/get';
 import styles from '../styles/styles';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
+import Permissions from '../libs/Permissions';
 import OptionsSelector from './OptionsSelector';
 import ONYXKEYS from '../ONYXKEYS';
 import compose from '../libs/compose';
@@ -29,6 +30,7 @@ import Image from './Image';
 import useLocalize from '../hooks/useLocalize';
 import * as ReceiptUtils from '../libs/ReceiptUtils';
 import categoryPropTypes from './categoryPropTypes';
+import tagPropTypes from './tagPropTypes';
 import ConfirmedRoute from './ConfirmedRoute';
 import transactionPropTypes from './transactionPropTypes';
 import DistanceRequestUtils from '../libs/DistanceRequestUtils';
@@ -68,6 +70,9 @@ const propTypes = {
     /** IOU Category */
     iouCategory: PropTypes.string,
 
+    /** IOU Tag */
+    iouTag: PropTypes.string,
+
     /** Selected participants from MoneyRequestModal with login / accountID */
     selectedParticipants: PropTypes.arrayOf(optionPropTypes).isRequired,
 
@@ -90,6 +95,9 @@ const propTypes = {
         email: PropTypes.string.isRequired,
     }),
 
+    /** List of betas available to current user */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
     /** The policyID of the request */
     policyID: PropTypes.string,
 
@@ -105,10 +113,6 @@ const propTypes = {
     /** List styles for OptionsSelector */
     listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
-    /* Onyx Props */
-    /** Collection of categories attached to a policy */
-    policyCategories: PropTypes.objectOf(categoryPropTypes),
-
     /** ID of the transaction that represents the money request */
     transactionID: PropTypes.string,
 
@@ -129,6 +133,19 @@ const propTypes = {
 
     /** Whether the money request is a distance request */
     isDistanceRequest: PropTypes.bool,
+
+    /* Onyx Props */
+    /** Collection of categories attached to a policy */
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            required: PropTypes.bool,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
 };
 
 const defaultProps = {
@@ -137,6 +154,7 @@ const defaultProps = {
     onSelectParticipant: () => {},
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     iouCategory: '',
+    iouTag: '',
     payeePersonalDetails: null,
     canModifyParticipants: false,
     isReadOnly: false,
@@ -144,6 +162,7 @@ const defaultProps = {
     session: {
         email: null,
     },
+    betas: [],
     policyID: '',
     reportID: '',
     ...withCurrentUserPersonalDetailsDefaultProps,
@@ -151,6 +170,7 @@ const defaultProps = {
     receiptSource: '',
     listStyles: [],
     policyCategories: {},
+    policyTags: {},
     transactionID: '',
     transaction: {},
     mileageRate: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate: 0, currency: 'USD'},
@@ -171,7 +191,13 @@ function MoneyRequestConfirmationList(props) {
     const {unit, rate, currency} = props.mileageRate;
     const distance = lodashGet(transaction, 'routes.route0.distance', 0);
     const shouldCalculateDistanceAmount = props.isDistanceRequest && props.iouAmount === 0;
-    const shouldCategoryEditable = !_.isEmpty(props.policyCategories) && !props.isDistanceRequest;
+    const shouldCategoryBeEditable = !_.isEmpty(props.policyCategories) && Permissions.canUseCategories(props.betas);
+
+    // Fetches the first tag list of the policy
+    const tagListKey = _.first(_.keys(props.policyTags));
+    const tagList = lodashGet(props.policyTags, [tagListKey, 'tags'], []);
+    const tagListName = lodashGet(props.policyTags, [tagListKey, 'name'], '');
+    const canUseTags = Permissions.canUseTags(props.betas);
 
     const formattedAmount = CurrencyUtils.convertToDisplayString(
         shouldCalculateDistanceAmount ? DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate) : props.iouAmount,
@@ -470,7 +496,7 @@ function MoneyRequestConfirmationList(props) {
                             description={translate('common.distance')}
                             style={[styles.moneyRequestMenuItem, styles.mb2]}
                             titleStyle={styles.flex1}
-                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestRoute(props.iouType, props.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestAddressRoute(props.iouType, props.reportID))}
                             disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                         />
                     ) : (
@@ -484,7 +510,7 @@ function MoneyRequestConfirmationList(props) {
                             disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                         />
                     )}
-                    {shouldCategoryEditable && (
+                    {shouldCategoryBeEditable && (
                         <MenuItemWithTopDescription
                             shouldShowRightIcon={!props.isReadOnly}
                             title={props.iouCategory}
@@ -494,6 +520,16 @@ function MoneyRequestConfirmationList(props) {
                             disabled={didConfirm || props.isReadOnly}
                         />
                     )}
+                    {canUseTags && !!tagList && (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly}
+                            title={props.iouTag}
+                            description={tagListName || translate('common.tag')}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestTagRoute(props.iouType, props.reportID))}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            disabled={didConfirm || props.isReadOnly}
+                        />
+                    )}
                 </>
             )}
         </OptionsSelector>
@@ -509,9 +545,15 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
         policyCategories: {
             key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
         },
+        policyTags: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+        },
         mileageRate: {
             key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             selector: DistanceRequestUtils.getDefaultMileageRate,
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index f04a41ae1153..bdd7365b7893 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -15,19 +15,16 @@ import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
 import ONYXKEYS from '../ONYXKEYS';
 import * as IOU from '../libs/actions/IOU';
-import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import ConfirmModal from './ConfirmModal';
 import useLocalize from '../hooks/useLocalize';
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import * as TransactionUtils from '../libs/TransactionUtils';
+import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
 
 const propTypes = {
     /** The report currently being looked at */
     report: iouReportPropTypes.isRequired,
 
-    /** The expense report or iou report (only will have a value if this is a transaction thread) */
-    parentReport: iouReportPropTypes,
-
     /** The policy which the report is tied to */
     policy: PropTypes.shape({
         /** Name of the policy */
@@ -37,12 +34,25 @@ const propTypes = {
     /** Personal details so we can get the ones for the report participants */
     personalDetails: PropTypes.objectOf(participantPropTypes).isRequired,
 
+    /** Onyx Props */
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
         /** Currently logged in user email */
         email: PropTypes.string,
     }),
 
+    /** The expense report or iou report (only will have a value if this is a transaction thread) */
+    parentReport: iouReportPropTypes,
+
+    /** The report action the transaction is tied to from the parent report */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
+    /** The transaction from the parent report action */
+    transaction: PropTypes.shape({
+        /** The ID of the transaction */
+        transactionID: PropTypes.string,
+    }),
+
     ...windowDimensionsPropTypes,
 };
 
@@ -51,6 +61,8 @@ const defaultProps = {
         email: null,
     },
     parentReport: {},
+    parentReportAction: {},
+    transaction: {},
 };
 
 function MoneyRequestHeader(props) {
@@ -59,21 +71,18 @@ function MoneyRequestHeader(props) {
     const moneyRequestReport = props.parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
 
-    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
-
     // Only the requestor can take delete the request, admins can only edit it.
-    const isActionOwner = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
+    const isActionOwner = props.parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
     const report = props.report;
     report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
     report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
 
     const deleteTransaction = useCallback(() => {
-        IOU.deleteMoneyRequest(parentReportAction.originalMessage.IOUTransactionID, parentReportAction, true);
+        IOU.deleteMoneyRequest(props.parentReportAction.originalMessage.IOUTransactionID, props.parentReportAction, true);
         setIsDeleteModalVisible(false);
-    }, [parentReportAction, setIsDeleteModalVisible]);
+    }, [props.parentReportAction, setIsDeleteModalVisible]);
 
-    const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
-    const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
+    const isScanning = TransactionUtils.hasReceipt(props.transaction) && TransactionUtils.isReceiptBeingScanned(props.transaction);
 
     return (
         <>
@@ -85,7 +94,7 @@ function MoneyRequestHeader(props) {
                     threeDotsMenuItems={[
                         {
                             icon: Expensicons.Trashcan,
-                            text: translate('reportActionContextMenu.deleteAction', {action: parentReportAction}),
+                            text: translate('reportActionContextMenu.deleteAction', {action: props.parentReportAction}),
                             onSelected: () => setIsDeleteModalVisible(true),
                         },
                     ]}
@@ -125,5 +134,14 @@ export default compose(
         parentReport: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
         },
+        parentReportAction: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${(report.parentReportID, report.parentReportActionID)}`,
+            selector: (reportActions, props) => props && props.parentReport && reportActions && reportActions[props.parentReport.parentReportActionID],
+            canEvict: false,
+        },
+        transaction: {
+            key: ({report, parentReportActions}) =>
+                `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportActions, [report.parentReportActionID, 'originalMessage', 'IOUTransactionID'], '')}`,
+        },
     }),
 )(MoneyRequestHeader);
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index adaa4457bbd9..50aff23dc9d0 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -39,6 +39,9 @@ const propTypes = {
     /** Whether we should show the selected state */
     showSelectedState: PropTypes.bool,
 
+    /** Whether we highlight selected option */
+    highlightSelected: PropTypes.bool,
+
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
@@ -57,6 +60,9 @@ const propTypes = {
     /** Whether to remove the lateral padding and align the content with the margins */
     shouldDisableRowInnerPadding: PropTypes.bool,
 
+    /** Whether to wrap large text up to 2 lines */
+    isMultilineSupported: PropTypes.bool,
+
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     ...withLocalizePropTypes,
@@ -65,12 +71,14 @@ const propTypes = {
 const defaultProps = {
     hoverStyle: styles.sidebarLinkHover,
     showSelectedState: false,
+    highlightSelected: false,
     isSelected: false,
     boldStyle: false,
     showTitleTooltip: false,
     onSelectRow: undefined,
     isDisabled: false,
     optionIsFocused: false,
+    isMultilineSupported: false,
     style: null,
     shouldHaveOptionSeparator: false,
     shouldDisableRowInnerPadding: false,
@@ -89,9 +97,11 @@ class OptionRow extends Component {
         return (
             this.state.isDisabled !== nextState.isDisabled ||
             this.props.isDisabled !== nextProps.isDisabled ||
+            this.props.isMultilineSupported !== nextProps.isMultilineSupported ||
             this.props.isSelected !== nextProps.isSelected ||
             this.props.shouldHaveOptionSeparator !== nextProps.shouldHaveOptionSeparator ||
             this.props.showSelectedState !== nextProps.showSelectedState ||
+            this.props.highlightSelected !== nextProps.highlightSelected ||
             this.props.showTitleTooltip !== nextProps.showTitleTooltip ||
             !_.isEqual(this.props.option.icons, nextProps.option.icons) ||
             this.props.optionIsFocused !== nextProps.optionIsFocused ||
@@ -119,7 +129,7 @@ class OptionRow extends Component {
         let pressableRef = null;
         const textStyle = this.props.optionIsFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;
         const textUnreadStyle = this.props.boldStyle || this.props.option.boldStyle ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
-        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre);
+        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre, this.state.isDisabled ? styles.optionRowDisabled : {});
         const alternateTextStyle = StyleUtils.combineStyles(
             textStyle,
             styles.optionAlternateText,
@@ -182,6 +192,7 @@ class OptionRow extends Component {
                                 this.props.optionIsFocused ? styles.sidebarLinkActive : null,
                                 this.props.shouldHaveOptionSeparator && styles.borderTop,
                                 !this.props.onSelectRow && !this.props.isDisabled ? styles.cursorDefault : null,
+                                this.props.isSelected && this.props.highlightSelected && styles.optionRowSelected,
                             ]}
                             accessibilityLabel={this.props.option.text}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
@@ -216,7 +227,7 @@ class OptionRow extends Component {
                                             fullTitle={this.props.option.text}
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled={this.props.showTitleTooltip}
-                                            numberOfLines={1}
+                                            numberOfLines={this.props.isMultilineSupported ? 2 : 1}
                                             textStyles={displayNameStyle}
                                             shouldUseFullTitle={
                                                 this.props.option.isChatRoom ||
@@ -249,6 +260,14 @@ class OptionRow extends Component {
                                         </View>
                                     )}
                                     {this.props.showSelectedState && <SelectCircle isChecked={this.props.isSelected} />}
+                                    {this.props.isSelected && this.props.highlightSelected && (
+                                        <View style={styles.defaultCheckmarkWrapper}>
+                                            <Icon
+                                                src={Expensicons.Checkmark}
+                                                fill={themeColors.iconSuccessFill}
+                                            />
+                                        </View>
+                                    )}
                                 </View>
                             </View>
                             {Boolean(this.props.option.customIcon) && (
diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
index 8f63cfc29959..9c139a04dfbb 100644
--- a/src/components/OptionsList/BaseOptionsList.js
+++ b/src/components/OptionsList/BaseOptionsList.js
@@ -56,10 +56,12 @@ function BaseOptionsList({
     shouldDisableRowInnerPadding,
     disableFocusOptions,
     canSelectMultipleOptions,
+    highlightSelectedOptions,
     onSelectRow,
     boldStyle,
     isDisabled,
     innerRef,
+    isRowMultilineSupported,
 }) {
     const flattenedData = useRef();
     const previousSections = usePrevious(sections);
@@ -168,6 +170,18 @@ function BaseOptionsList({
      */
     const renderItem = ({item, index, section}) => {
         const isItemDisabled = isDisabled || section.isDisabled || !!item.isDisabled;
+        const isSelected = _.some(selectedOptions, (option) => {
+            if (option.accountID === item.accountID) {
+                return true;
+            }
+
+            if (_.isEmpty(option.name)) {
+                return false;
+            }
+
+            return option.name === item.searchText;
+        });
+
         return (
             <OptionRow
                 option={item}
@@ -175,12 +189,14 @@ function BaseOptionsList({
                 hoverStyle={optionHoveredStyle}
                 optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + section.indexOffset}
                 onSelectRow={onSelectRow}
-                isSelected={Boolean(_.find(selectedOptions, (option) => option.accountID === item.accountID))}
+                isSelected={isSelected}
                 showSelectedState={canSelectMultipleOptions}
+                highlightSelected={highlightSelectedOptions}
                 boldStyle={boldStyle}
                 isDisabled={isItemDisabled}
                 shouldHaveOptionSeparator={index > 0 && shouldHaveOptionSeparator}
                 shouldDisableRowInnerPadding={shouldDisableRowInnerPadding}
+                isMultilineSupported={isRowMultilineSupported}
             />
         );
     };
@@ -214,7 +230,7 @@ function BaseOptionsList({
     return (
         <View style={listContainerStyles}>
             {isLoading ? (
-                <OptionsListSkeletonView />
+                <OptionsListSkeletonView shouldAnimate />
             ) : (
                 <>
                     {headerMessage ? (
diff --git a/src/components/OptionsList/optionsListPropTypes.js b/src/components/OptionsList/optionsListPropTypes.js
index 74c13c7f2455..a2479c878041 100644
--- a/src/components/OptionsList/optionsListPropTypes.js
+++ b/src/components/OptionsList/optionsListPropTypes.js
@@ -40,6 +40,9 @@ const propTypes = {
     /** Whether we can select multiple options or not */
     canSelectMultipleOptions: PropTypes.bool,
 
+    /** Whether we highlight selected options */
+    highlightSelectedOptions: PropTypes.bool,
+
     /** Whether to show headers above each section or not */
     hideSectionHeaders: PropTypes.bool,
 
@@ -78,6 +81,9 @@ const propTypes = {
 
     /** Whether to show the scroll bar */
     showScrollIndicator: PropTypes.bool,
+
+    /** Whether to wrap large text up to 2 lines */
+    isRowMultilineSupported: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -88,6 +94,7 @@ const defaultProps = {
     focusedIndex: 0,
     selectedOptions: [],
     canSelectMultipleOptions: false,
+    highlightSelectedOptions: false,
     hideSectionHeaders: false,
     disableFocusOptions: false,
     boldStyle: false,
@@ -101,6 +108,7 @@ const defaultProps = {
     shouldHaveOptionSeparator: false,
     shouldDisableRowInnerPadding: false,
     showScrollIndicator: false,
+    isRowMultilineSupported: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/OptionsListSkeletonView.js b/src/components/OptionsListSkeletonView.js
index ffe9652e3945..15c66affe84d 100644
--- a/src/components/OptionsListSkeletonView.js
+++ b/src/components/OptionsListSkeletonView.js
@@ -60,8 +60,8 @@ class OptionsListSkeletonView extends React.Component {
                     key={`skeletonViewItems${i}`}
                     animate={this.props.shouldAnimate}
                     height={CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT}
-                    backgroundColor={themeColors.borderLighter}
-                    foregroundColor={themeColors.border}
+                    backgroundColor={themeColors.skeletonLHNIn}
+                    foregroundColor={themeColors.skeletonLHNOut}
                     style={styles.mr5}
                 >
                     <Circle
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index 338de90a0509..ee3840bff69d 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -139,6 +139,10 @@ class BaseOptionsSelector extends Component {
      * @returns {Number}
      */
     getInitiallyFocusedIndex(allOptions) {
+        if (_.isNumber(this.props.initialFocusedIndex)) {
+            return this.props.initialFocusedIndex;
+        }
+
         if (this.props.selectedOptions.length > 0) {
             return this.props.selectedOptions.length;
         }
@@ -374,6 +378,7 @@ class BaseOptionsSelector extends Component {
                 showTitleTooltip={this.props.showTitleTooltip}
                 isDisabled={this.props.isDisabled}
                 shouldHaveOptionSeparator={this.props.shouldHaveOptionSeparator}
+                highlightSelectedOptions={this.props.highlightSelectedOptions}
                 onLayout={() => {
                     if (this.props.selectedOptions.length === 0) {
                         this.scrollToIndex(this.state.focusedIndex, false);
@@ -388,6 +393,7 @@ class BaseOptionsSelector extends Component {
                 listStyles={this.props.listStyles}
                 isLoading={!this.props.shouldShowOptions}
                 showScrollIndicator={this.props.showScrollIndicator}
+                isRowMultilineSupported={this.props.isRowMultilineSupported}
             />
         );
         return (
diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js
index 02b807bf66c1..dff0a16c0b3e 100644
--- a/src/components/OptionsSelector/optionsSelectorPropTypes.js
+++ b/src/components/OptionsSelector/optionsSelectorPropTypes.js
@@ -53,6 +53,9 @@ const propTypes = {
     /** Whether we can select multiple options */
     canSelectMultipleOptions: PropTypes.bool,
 
+    /** Whether we highlight selected options */
+    highlightSelectedOptions: PropTypes.bool,
+
     /** Whether any section headers should be visible */
     hideSectionHeaders: PropTypes.bool,
 
@@ -106,6 +109,12 @@ const propTypes = {
 
     /** Whether to use default padding and flex styles for children */
     shouldUseStyleForChildren: PropTypes.bool,
+
+    /** Whether to wrap large text up to 2 lines */
+    isRowMultilineSupported: PropTypes.bool,
+
+    /** Initial focused index value */
+    initialFocusedIndex: PropTypes.number,
 };
 
 const defaultProps = {
@@ -116,6 +125,7 @@ const defaultProps = {
     selectedOptions: [],
     headerMessage: '',
     canSelectMultipleOptions: false,
+    highlightSelectedOptions: false,
     hideSectionHeaders: false,
     boldStyle: false,
     showTitleTooltip: false,
@@ -136,6 +146,8 @@ const defaultProps = {
     shouldShowTextInput: true,
     onChangeText: () => {},
     shouldUseStyleForChildren: true,
+    isRowMultilineSupported: false,
+    initialFocusedIndex: undefined,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/PDFView/index.native.js b/src/components/PDFView/index.native.js
index c240ade664e5..0bd9936c628b 100644
--- a/src/components/PDFView/index.native.js
+++ b/src/components/PDFView/index.native.js
@@ -148,6 +148,7 @@ class PDFView extends Component {
                 )}
                 {this.state.shouldAttemptPDFLoad && (
                     <PDF
+                        fitPolicy={0}
                         trustAllCerts={false}
                         renderActivityIndicator={() => <FullScreenLoadingIndicator />}
                         source={{uri: this.props.sourceURL}}
diff --git a/src/components/Picker/BasePicker.js b/src/components/Picker/BasePicker.js
index 550b8a386aa1..697dfc509d22 100644
--- a/src/components/Picker/BasePicker.js
+++ b/src/components/Picker/BasePicker.js
@@ -258,6 +258,7 @@ function BasePicker(props) {
                     }}
                     pickerProps={{
                         ref: picker,
+                        tabIndex: -1,
                         onFocus: enableHighlight,
                         onBlur: () => {
                             disableHighlight();
diff --git a/src/components/PlaidLink/index.native.js b/src/components/PlaidLink/index.native.js
index cd17453820cf..48cd41e283c3 100644
--- a/src/components/PlaidLink/index.native.js
+++ b/src/components/PlaidLink/index.native.js
@@ -1,16 +1,13 @@
 import {useEffect} from 'react';
 import {openLink, useDeepLinkRedirector, usePlaidEmitter} from 'react-native-plaid-link-sdk';
 import Log from '../../libs/Log';
-import CONST from '../../CONST';
 import {plaidLinkPropTypes, plaidLinkDefaultProps} from './plaidLinkPropTypes';
 
 function PlaidLink(props) {
     useDeepLinkRedirector();
     usePlaidEmitter((event) => {
         Log.info('[PlaidLink] Handled Plaid Event: ', false, event);
-        if (event.eventName === CONST.PLAID.EVENT.ERROR) {
-            props.onError(event.metadata);
-        }
+        props.onEvent(event.eventName, event.metadata);
     });
     useEffect(() => {
         openLink({
@@ -20,9 +17,6 @@ function PlaidLink(props) {
             onSuccess: ({publicToken, metadata}) => {
                 props.onSuccess({publicToken, metadata});
             },
-            onEvent: (event, metadata) => {
-                props.onEvent(event, metadata);
-            },
             onExit: (exitError, metadata) => {
                 Log.info('[PlaidLink] Exit: ', false, {exitError, metadata});
                 props.onExit();
diff --git a/src/components/QRShare/index.js b/src/components/QRShare/index.js
index 05ae4165ea8e..d96024ad1046 100644
--- a/src/components/QRShare/index.js
+++ b/src/components/QRShare/index.js
@@ -50,7 +50,7 @@ class QRShare extends Component {
             >
                 <View style={styles.expensifyQrLogo}>
                     <ExpensifyWordmark
-                        fill={defaultTheme.borderFocus}
+                        fill={defaultTheme.QRLogo}
                         width="100%"
                         height="100%"
                     />
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index ec2755f1a5dd..c1e1764ed9f1 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -42,7 +42,7 @@ const defaultProps = {
 
 function ReportActionItemEmojiReactions(props) {
     const {reactionListRef} = useContext(ReportScreenContext);
-    const popoverReactionListAnchor = useRef(null);
+    const popoverReactionListAnchors = useRef({});
     let totalReactionCount = 0;
 
     // Each emoji is sorted by the oldest timestamp of user reactions so that they will always appear in the same order for everyone
@@ -95,7 +95,7 @@ function ReportActionItemEmojiReactions(props) {
         };
 
         const onReactionListOpen = (event) => {
-            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportActionID);
+            reactionListRef.current.showReactionList(event, popoverReactionListAnchors.current[reactionEmojiName], reactionEmojiName, props.reportActionID);
         };
 
         return {
@@ -112,10 +112,7 @@ function ReportActionItemEmojiReactions(props) {
 
     return (
         totalReactionCount > 0 && (
-            <View
-                ref={popoverReactionListAnchor}
-                style={[styles.flexRow, styles.flexWrap, styles.gap1, styles.mt2]}
-            >
+            <View style={[styles.flexRow, styles.flexWrap, styles.gap1, styles.mt2]}>
                 {_.map(formattedReactions, (reaction) => {
                     if (reaction === null) {
                         return;
@@ -135,7 +132,7 @@ function ReportActionItemEmojiReactions(props) {
                         >
                             <View>
                                 <EmojiReactionBubble
-                                    ref={props.forwardedRef}
+                                    ref={(ref) => (popoverReactionListAnchors.current[reaction.reactionEmojiName] = ref)}
                                     count={reaction.reactionCount}
                                     emojiCodes={reaction.emojiCodes}
                                     onPress={reaction.onPress}
diff --git a/src/components/ReportActionItem/MoneyReportView.js b/src/components/ReportActionItem/MoneyReportView.js
index 5b4eaaa37884..68eecf11d5bf 100644
--- a/src/components/ReportActionItem/MoneyReportView.js
+++ b/src/components/ReportActionItem/MoneyReportView.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import reportPropTypes from '../../pages/reportPropTypes';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
 import styles from '../../styles/styles';
+import themeColors from '../../styles/themes/default';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as StyleUtils from '../../styles/StyleUtils';
 import CONST from '../../CONST';
@@ -53,7 +54,7 @@ function MoneyReportView(props) {
                         <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
                             <Icon
                                 src={Expensicons.Checkmark}
-                                fill={styles.success}
+                                fill={themeColors.success}
                             />
                         </View>
                     )}
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 02da03225062..a5a499169cbd 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -33,7 +33,6 @@ import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import ReportActionItemImages from './ReportActionItemImages';
 import transactionPropTypes from '../transactionPropTypes';
 import * as StyleUtils from '../../styles/StyleUtils';
-import colors from '../../styles/colors';
 import variables from '../../styles/variables';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import MoneyRequestSkeletonView from '../MoneyRequestSkeletonView';
@@ -265,7 +264,7 @@ function MoneyRequestPreview(props) {
                                 {hasFieldErrors && (
                                     <Icon
                                         src={Expensicons.DotIndicator}
-                                        fill={colors.red}
+                                        fill={themeColors.danger}
                                     />
                                 )}
                             </View>
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index b95fdaad1025..1f60dddef6ec 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -30,7 +30,6 @@ import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import * as ReportActionUtils from '../../libs/ReportActionsUtils';
 import * as TransactionUtils from '../../libs/TransactionUtils';
 import ReportActionItemImages from './ReportActionItemImages';
-import colors from '../../styles/colors';
 
 const propTypes = {
     /** All the data of the action */
@@ -111,6 +110,7 @@ function ReportPreview(props) {
     const reportTotal = ReportUtils.getMoneyRequestTotal(props.iouReport);
 
     const iouSettled = ReportUtils.isSettled(props.iouReportID);
+    const iouCanceled = ReportUtils.isArchivedRoom(props.chatReport);
     const numberOfRequests = ReportActionUtils.getNumberOfMoneyRequests(props.action);
     const moneyRequestComment = lodashGet(props.action, 'childLastMoneyRequestComment', '');
 
@@ -165,8 +165,8 @@ function ReportPreview(props) {
 
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowSettlementButton = ReportUtils.isControlPolicyExpenseChat(props.chatReport)
-        ? props.policy.role === CONST.POLICY.ROLE.ADMIN && ReportUtils.isReportApproved(props.iouReport) && !iouSettled
-        : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
+        ? props.policy.role === CONST.POLICY.ROLE.ADMIN && ReportUtils.isReportApproved(props.iouReport) && !iouSettled && !iouCanceled
+        : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !iouCanceled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
 
     return (
         <View style={[styles.chatItemMessage, ...props.containerStyles]}>
@@ -198,7 +198,7 @@ function ReportPreview(props) {
                             {hasErrors && (
                                 <Icon
                                     src={Expensicons.DotIndicator}
-                                    fill={colors.red}
+                                    fill={themeColors.danger}
                                 />
                             )}
                         </View>
diff --git a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
index f87ae176e3ac..ddaa46e0b731 100644
--- a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
+++ b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
@@ -21,8 +21,8 @@ function SkeletonViewLines(props) {
         <SkeletonViewContentLoader
             animate={props.shouldAnimate}
             height={CONST.CHAT_SKELETON_VIEW.HEIGHT_FOR_ROW_COUNT[props.numberOfRows]}
-            backgroundColor={themeColors.highlightBG}
-            foregroundColor={themeColors.border}
+            backgroundColor={themeColors.skeletonLHNIn}
+            foregroundColor={themeColors.skeletonLHNOut}
             style={styles.mr5}
         >
             <Circle
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
index f760e5d5aeb4..f0f8b8a4b09b 100644
--- a/src/components/ScreenWrapper/index.js
+++ b/src/components/ScreenWrapper/index.js
@@ -3,6 +3,7 @@ import React from 'react';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {PickerAvoidingView} from 'react-native-picker-select';
+import FocusTrapView from '../FocusTrapView';
 import KeyboardAvoidingView from '../KeyboardAvoidingView';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
@@ -124,20 +125,26 @@ class ScreenWrapper extends React.Component {
                                         style={styles.flex1}
                                         enabled={this.props.shouldEnablePickerAvoiding}
                                     >
-                                        <HeaderGap styles={this.props.headerGapStyles} />
-                                        {this.props.environment === CONST.ENVIRONMENT.DEV && <TestToolsModal />}
-                                        {this.props.environment === CONST.ENVIRONMENT.DEV && <CustomDevMenu />}
-                                        {
-                                            // If props.children is a function, call it to provide the insets to the children.
-                                            _.isFunction(this.props.children)
-                                                ? this.props.children({
-                                                      insets,
-                                                      safeAreaPaddingBottomStyle,
-                                                      didScreenTransitionEnd: this.state.didScreenTransitionEnd,
-                                                  })
-                                                : this.props.children
-                                        }
-                                        {this.props.isSmallScreenWidth && this.props.shouldShowOfflineIndicator && <OfflineIndicator style={this.props.offlineIndicatorStyle} />}
+                                        <FocusTrapView
+                                            style={[styles.flex1, styles.noSelect]}
+                                            enabled={!this.props.shouldDisableFocusTrap}
+                                            shouldEnableAutoFocus={this.props.shouldEnableAutoFocus}
+                                        >
+                                            <HeaderGap styles={this.props.headerGapStyles} />
+                                            {this.props.environment === CONST.ENVIRONMENT.DEV && <TestToolsModal />}
+                                            {this.props.environment === CONST.ENVIRONMENT.DEV && <CustomDevMenu />}
+                                            {
+                                                // If props.children is a function, call it to provide the insets to the children.
+                                                _.isFunction(this.props.children)
+                                                    ? this.props.children({
+                                                          insets,
+                                                          safeAreaPaddingBottomStyle,
+                                                          didScreenTransitionEnd: this.state.didScreenTransitionEnd,
+                                                      })
+                                                    : this.props.children
+                                            }
+                                            {this.props.isSmallScreenWidth && this.props.shouldShowOfflineIndicator && <OfflineIndicator style={this.props.offlineIndicatorStyle} />}
+                                        </FocusTrapView>
                                     </PickerAvoidingView>
                                 </KeyboardAvoidingView>
                             </View>
diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js
index 83033d9e97b7..c3538b3c026d 100644
--- a/src/components/ScreenWrapper/propTypes.js
+++ b/src/components/ScreenWrapper/propTypes.js
@@ -48,6 +48,12 @@ const propTypes = {
 
     /** Styles for the offline indicator */
     offlineIndicatorStyle: stylePropTypes,
+
+    /** Whether to disable the focus trap */
+    shouldDisableFocusTrap: PropTypes.bool,
+
+    /** Whether to disable auto focus of the focus trap */
+    shouldEnableAutoFocus: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -63,6 +69,8 @@ const defaultProps = {
     shouldShowOfflineIndicator: true,
     offlineIndicatorStyle: [],
     headerGapStyles: [],
+    shouldDisableFocusTrap: false,
+    shouldEnableAutoFocus: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/SelectionList/BaseSelectionList.js b/src/components/SelectionList/BaseSelectionList.js
index b76ded8a542f..e54d64fe56e8 100644
--- a/src/components/SelectionList/BaseSelectionList.js
+++ b/src/components/SelectionList/BaseSelectionList.js
@@ -12,7 +12,7 @@ import CONST from '../../CONST';
 import variables from '../../styles/variables';
 import {propTypes as selectionListPropTypes} from './selectionListPropTypes';
 import RadioListItem from './RadioListItem';
-import CheckboxListItem from './CheckboxListItem';
+import UserListItem from './UserListItem';
 import useKeyboardShortcut from '../../hooks/useKeyboardShortcut';
 import SafeAreaConsumer from '../SafeAreaConsumer';
 import withKeyboardState, {keyboardStatePropTypes} from '../withKeyboardState';
@@ -242,16 +242,20 @@ function BaseSelectionList({
     };
 
     const renderItem = ({item, index, section}) => {
+        const normalizedIndex = index + lodashGet(section, 'indexOffset', 0);
         const isDisabled = section.isDisabled;
-        const isFocused = !isDisabled && focusedIndex === index + lodashGet(section, 'indexOffset', 0);
+        const isFocused = !isDisabled && focusedIndex === normalizedIndex;
+        // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
+        const showTooltip = normalizedIndex < 10;
 
         if (canSelectMultiple) {
             return (
-                <CheckboxListItem
+                <UserListItem
                     item={item}
                     isFocused={isFocused}
                     onSelectRow={() => selectRow(item, index)}
                     onDismissError={onDismissError}
+                    showTooltip={showTooltip}
                 />
             );
         }
@@ -351,7 +355,7 @@ function BaseSelectionList({
                                             disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
                                         />
                                         <View style={[styles.flex1]}>
-                                            <Text style={[styles.textStrong, styles.ph5]}>{translate('workspace.people.selectAll')}</Text>
+                                            <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
                                         </View>
                                     </PressableWithFeedback>
                                 )}
diff --git a/src/components/SelectionList/CheckboxListItem.js b/src/components/SelectionList/CheckboxListItem.js
deleted file mode 100644
index 256182a38e8b..000000000000
--- a/src/components/SelectionList/CheckboxListItem.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import PressableWithFeedback from '../Pressable/PressableWithFeedback';
-import styles from '../../styles/styles';
-import Text from '../Text';
-import {checkboxListItemPropTypes} from './selectionListPropTypes';
-import Avatar from '../Avatar';
-import OfflineWithFeedback from '../OfflineWithFeedback';
-import CONST from '../../CONST';
-import * as StyleUtils from '../../styles/StyleUtils';
-import Icon from '../Icon';
-import * as Expensicons from '../Icon/Expensicons';
-import themeColors from '../../styles/themes/default';
-
-function CheckboxListItem({item, isFocused = false, onSelectRow, onDismissError = () => {}}) {
-    const hasError = !_.isEmpty(item.errors);
-
-    return (
-        <OfflineWithFeedback
-            onClose={() => onDismissError(item)}
-            pendingAction={item.pendingAction}
-            errors={item.errors}
-            errorRowStyles={styles.ph5}
-        >
-            <PressableWithFeedback
-                style={[styles.peopleRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive, hasError && styles.borderColorDanger]}
-                onPress={() => onSelectRow(item)}
-                disabled={item.isDisabled}
-                accessibilityLabel={item.text}
-                accessibilityRole="checkbox"
-                accessibilityState={{checked: item.isSelected}}
-                hoverDimmingValue={1}
-                hoverStyle={styles.hoveredComponentBG}
-                focusStyle={styles.hoveredComponentBG}
-            >
-                <View
-                    style={[
-                        StyleUtils.getCheckboxContainerStyle(20, 4),
-                        item.isSelected && styles.checkedContainer,
-                        item.isSelected && styles.borderColorFocus,
-                        item.isDisabled && styles.cursorDisabled,
-                        item.isDisabled && styles.buttonOpacityDisabled,
-                    ]}
-                >
-                    {item.isSelected && (
-                        <Icon
-                            src={Expensicons.Checkmark}
-                            fill={themeColors.textLight}
-                            height={14}
-                            width={14}
-                        />
-                    )}
-                </View>
-                {Boolean(item.avatar) && (
-                    <Avatar
-                        containerStyles={styles.pl5}
-                        source={lodashGet(item, 'avatar.source', '')}
-                        name={lodashGet(item, 'avatar.name', item.text)}
-                        type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
-                    />
-                )}
-                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
-                    <Text
-                        style={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.sidebarLinkTextBold]}
-                        numberOfLines={1}
-                    >
-                        {item.text}
-                    </Text>
-                    {Boolean(item.alternateText) && (
-                        <Text
-                            style={[isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                            numberOfLines={1}
-                        >
-                            {item.alternateText}
-                        </Text>
-                    )}
-                </View>
-                {Boolean(item.rightElement) && item.rightElement}
-            </PressableWithFeedback>
-        </OfflineWithFeedback>
-    );
-}
-
-CheckboxListItem.displayName = 'CheckboxListItem';
-CheckboxListItem.propTypes = checkboxListItemPropTypes;
-
-export default CheckboxListItem;
diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js
new file mode 100644
index 000000000000..a3c25f09af3b
--- /dev/null
+++ b/src/components/SelectionList/UserListItem.js
@@ -0,0 +1,111 @@
+import React from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import styles from '../../styles/styles';
+import Text from '../Text';
+import {userListItemPropTypes} from './selectionListPropTypes';
+import Avatar from '../Avatar';
+import OfflineWithFeedback from '../OfflineWithFeedback';
+import CONST from '../../CONST';
+import * as StyleUtils from '../../styles/StyleUtils';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import themeColors from '../../styles/themes/default';
+import Tooltip from '../Tooltip';
+import UserDetailsTooltip from '../UserDetailsTooltip';
+
+function UserListItem({item, isFocused = false, showTooltip, onSelectRow, onDismissError = () => {}}) {
+    const hasError = !_.isEmpty(item.errors);
+
+    const avatar = (
+        <Avatar
+            containerStyles={styles.pl3}
+            source={lodashGet(item, 'avatar.source', '')}
+            name={lodashGet(item, 'avatar.name', item.text)}
+            type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
+        />
+    );
+
+    const text = (
+        <Text
+            style={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.sidebarLinkTextBold]}
+            numberOfLines={1}
+        >
+            {item.text}
+        </Text>
+    );
+
+    const alternateText = (
+        <Text
+            style={[isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+            numberOfLines={1}
+        >
+            {item.alternateText}
+        </Text>
+    );
+
+    return (
+        <OfflineWithFeedback
+            onClose={() => onDismissError(item)}
+            pendingAction={item.pendingAction}
+            errors={item.errors}
+            errorRowStyles={styles.ph5}
+        >
+            <PressableWithFeedback
+                style={[styles.peopleRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive, hasError && styles.borderColorDanger]}
+                onPress={() => onSelectRow(item)}
+                disabled={item.isDisabled}
+                accessibilityLabel={item.text}
+                accessibilityRole="checkbox"
+                accessibilityState={{checked: item.isSelected}}
+                hoverDimmingValue={1}
+                hoverStyle={styles.hoveredComponentBG}
+                focusStyle={styles.hoveredComponentBG}
+            >
+                <View style={styles.checkboxPressable}>
+                    <View
+                        style={[
+                            StyleUtils.getCheckboxContainerStyle(20, 4),
+                            item.isSelected && styles.checkedContainer,
+                            item.isSelected && styles.borderColorFocus,
+                            item.isDisabled && styles.cursorDisabled,
+                            item.isDisabled && styles.buttonOpacityDisabled,
+                        ]}
+                    >
+                        {item.isSelected && (
+                            <Icon
+                                src={Expensicons.Checkmark}
+                                fill={themeColors.textLight}
+                                height={14}
+                                width={14}
+                            />
+                        )}
+                    </View>
+                </View>
+                {Boolean(item.avatar) &&
+                    (showTooltip ? (
+                        <UserDetailsTooltip
+                            accountID={item.accountID}
+                            shiftHorizontal={styles.pl3.paddingLeft / 2}
+                        >
+                            <View>{avatar}</View>
+                        </UserDetailsTooltip>
+                    ) : (
+                        avatar
+                    ))}
+                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
+                    {showTooltip ? <Tooltip text={item.text}>{text}</Tooltip> : text}
+                    {Boolean(item.alternateText) && (showTooltip ? <Tooltip text={item.alternateText}>{alternateText}</Tooltip> : alternateText)}
+                </View>
+                {Boolean(item.rightElement) && item.rightElement}
+            </PressableWithFeedback>
+        </OfflineWithFeedback>
+    );
+}
+
+UserListItem.displayName = 'UserListItem';
+UserListItem.propTypes = userListItemPropTypes;
+
+export default UserListItem;
diff --git a/src/components/SelectionList/selectionListPropTypes.js b/src/components/SelectionList/selectionListPropTypes.js
index 1a4fd6c5ecab..0a3c1efdf6a3 100644
--- a/src/components/SelectionList/selectionListPropTypes.js
+++ b/src/components/SelectionList/selectionListPropTypes.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import CONST from '../../CONST';
 
-const checkboxListItemPropTypes = {
+const userListItemPropTypes = {
     /** The section list item */
     item: PropTypes.shape({
         /** Text to display */
@@ -46,6 +46,9 @@ const checkboxListItemPropTypes = {
     /** Whether this item is focused (for arrow key controls) */
     isFocused: PropTypes.bool,
 
+    /** Whether this item should show Tooltip */
+    showTooltip: PropTypes.bool.isRequired,
+
     /** Callback to fire when the item is pressed */
     onSelectRow: PropTypes.func.isRequired,
 
@@ -90,7 +93,7 @@ const propTypes = {
             indexOffset: PropTypes.number,
 
             /** Array of options */
-            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(checkboxListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
+            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(userListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
 
             /** Whether this section items disabled for selection */
             isDisabled: PropTypes.bool,
@@ -155,4 +158,4 @@ const propTypes = {
     showConfirmButton: PropTypes.bool,
 };
 
-export {propTypes, radioListItemPropTypes, checkboxListItemPropTypes};
+export {propTypes, radioListItemPropTypes, userListItemPropTypes};
diff --git a/src/components/SignInButtons/GoogleSignIn/index.website.js b/src/components/SignInButtons/GoogleSignIn/index.website.js
index 33d6a2e382c9..5362433142af 100644
--- a/src/components/SignInButtons/GoogleSignIn/index.website.js
+++ b/src/components/SignInButtons/GoogleSignIn/index.website.js
@@ -68,6 +68,8 @@ function GoogleSignIn({translate, isDesktopFlow}) {
         };
     }, [loadScript]);
 
+    // willChangeTransform is used to prevent the icon cut in safari when the overflow hidden and width given to the parent
+    // ref: https://stackoverflow.com/questions/75306089/safari-when-using-border-radius-and-overflow-hidden-to-parent-and-the-child-th
     return isDesktopFlow ? (
         <View style={styles.googlePillButtonContainer}>
             <div
@@ -77,7 +79,7 @@ function GoogleSignIn({translate, isDesktopFlow}) {
             />
         </View>
     ) : (
-        <View style={styles.googleButtonContainer}>
+        <View style={[styles.googleButtonContainer, styles.willChangeTransform]}>
             <div
                 id={mainId}
                 role="button"
diff --git a/src/components/StatePicker/StateSelectorModal.js b/src/components/StatePicker/StateSelectorModal.js
index ae8d3efdd27e..bea335840c53 100644
--- a/src/components/StatePicker/StateSelectorModal.js
+++ b/src/components/StatePicker/StateSelectorModal.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import React, {useMemo, useEffect} from 'react';
 import PropTypes from 'prop-types';
+import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import CONST from '../../CONST';
 import Modal from '../Modal';
 import HeaderWithBackButton from '../HeaderWithBackButton';
@@ -53,13 +54,17 @@ function StateSelectorModal({currentState, isVisible, onClose, onStateSelected,
 
     const countryStates = useMemo(
         () =>
-            _.map(translate('allStates'), (state) => ({
-                value: state.stateISO,
-                keyForList: state.stateISO,
-                text: state.stateName,
-                isSelected: currentState === state.stateISO,
-                searchValue: StringUtils.sanitizeString(`${state.stateISO}${state.stateName}`),
-            })),
+            _.map(_.keys(COMMON_CONST.STATES), (state) => {
+                const stateName = translate(`allStates.${state}.stateName`);
+                const stateISO = translate(`allStates.${state}.stateISO`);
+                return {
+                    value: stateISO,
+                    keyForList: stateISO,
+                    text: stateName,
+                    isSelected: currentState === stateISO,
+                    searchValue: StringUtils.sanitizeString(`${stateISO}${stateName}`),
+                };
+            }),
         [translate, currentState],
     );
 
diff --git a/src/components/StatePicker/index.js b/src/components/StatePicker/index.js
index a4d3ea5e8133..142654b82cd1 100644
--- a/src/components/StatePicker/index.js
+++ b/src/components/StatePicker/index.js
@@ -1,6 +1,8 @@
 import React, {useState} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
+import _ from 'underscore';
+import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import styles from '../../styles/styles';
 import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
 import useLocalize from '../../hooks/useLocalize';
@@ -35,7 +37,6 @@ const defaultProps = {
 
 function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
     const {translate} = useLocalize();
-    const allStates = translate('allStates');
     const [isPickerVisible, setIsPickerVisible] = useState(false);
     const [searchValue, setSearchValue] = useState('');
 
@@ -52,7 +53,7 @@ function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
         hidePickerModal();
     };
 
-    const title = allStates[value] ? allStates[value].stateName : '';
+    const title = value && _.keys(COMMON_CONST.STATES).includes(value) ? translate(`allStates.${value}.stateName`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
index e1f8927bcb9b..3c69da78b860 100644
--- a/src/components/TabSelector/TabSelector.js
+++ b/src/components/TabSelector/TabSelector.js
@@ -79,10 +79,10 @@ const getBackgroundColor = (position, routesLength, tabIndex) => {
 
         return position.interpolate({
             inputRange,
-            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.midtone : themeColors.appBG)),
+            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.border : themeColors.appBG)),
         });
     }
-    return themeColors.midtone;
+    return themeColors.border;
 };
 
 function TabSelector({state, navigation, onTabPress, position}) {
diff --git a/src/components/TagPicker/index.js b/src/components/TagPicker/index.js
new file mode 100644
index 000000000000..25021bd817d7
--- /dev/null
+++ b/src/components/TagPicker/index.js
@@ -0,0 +1,90 @@
+import React, {useMemo} from 'react';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+import styles from '../../styles/styles';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
+import useLocalize from '../../hooks/useLocalize';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import OptionsSelector from '../OptionsSelector';
+import {propTypes, defaultProps} from './tagPickerPropTypes';
+
+function TagPicker({policyTags, reportID, tag, iouType, iou}) {
+    const {translate} = useLocalize();
+
+    const selectedOptions = useMemo(() => {
+        if (!iou.tag) {
+            return [];
+        }
+
+        return [
+            {
+                name: iou.tag,
+                enabled: true,
+            },
+        ];
+    }, [iou.tag]);
+
+    // Only shows one section, which will be the default behavior if there are
+    // less than 8 policy tags
+    // TODO: support sections with search
+    const sections = useMemo(() => {
+        const tagList = _.chain(lodashGet(policyTags, [tag, 'tags'], {}))
+            .values()
+            .map((t) => ({
+                text: t.name,
+                keyForList: t.name,
+                tooltipText: t.name,
+            }))
+            .value();
+
+        return [
+            {
+                data: tagList,
+            },
+        ];
+    }, [policyTags, tag]);
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, '');
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+    };
+
+    const updateTag = () => {
+        // TODO: add logic to save the selected tag
+        navigateBack();
+    };
+
+    return (
+        <OptionsSelector
+            optionHoveredStyle={styles.hoveredComponentBG}
+            sections={sections}
+            selectedOptions={selectedOptions}
+            headerMessage={headerMessage}
+            textInputLabel={translate('common.search')}
+            boldStyle
+            value=""
+            onSelectRow={updateTag}
+            shouldShowTextInput={false}
+        />
+    );
+}
+
+TagPicker.displayName = 'TagPicker';
+TagPicker.propTypes = propTypes;
+TagPicker.defaultProps = defaultProps;
+
+export default withOnyx({
+    policyTags: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+    },
+    policyRecentlyUsedTags: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${policyID}`,
+    },
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
+})(TagPicker);
diff --git a/src/components/TagPicker/tagPickerPropTypes.js b/src/components/TagPicker/tagPickerPropTypes.js
new file mode 100644
index 000000000000..ad57a0409f15
--- /dev/null
+++ b/src/components/TagPicker/tagPickerPropTypes.js
@@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import tagPropTypes from '../tagPropTypes';
+import {iouPropTypes, iouDefaultProps} from '../../pages/iou/propTypes';
+
+const propTypes = {
+    /** The report ID of the IOU */
+    reportID: PropTypes.string.isRequired,
+
+    /** The policyID we are getting tags for */
+    policyID: PropTypes.string.isRequired,
+
+    /** The name of tag list we are getting tags for */
+    tag: PropTypes.string.isRequired,
+
+    /** The type of IOU report, i.e. bill, request, send */
+    iouType: PropTypes.string.isRequired,
+
+    /** Callback to submit the selected tag */
+    onSubmit: PropTypes.func,
+
+    /* Onyx Props */
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
+
+    /** List of recently used tags */
+    policyRecentlyUsedTags: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.string)),
+
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
+};
+
+const defaultProps = {
+    policyTags: {},
+    policyRecentlyUsedTags: {},
+    iou: iouDefaultProps,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index 297d7de028fb..19453be054d4 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -331,6 +331,8 @@ function BaseTextInput(props) {
 
                                     // Stop scrollbar flashing when breaking lines with autoGrowHeight enabled.
                                     props.autoGrowHeight && StyleUtils.getAutoGrowHeightInputStyle(textInputHeight, maxHeight),
+                                    // Add disabled color theme when field is not editable.
+                                    props.disabled && styles.textInputDisabled,
                                 ]}
                                 multiline={isMultiline}
                                 maxLength={props.maxLength}
diff --git a/src/components/UnreadActionIndicator.js b/src/components/UnreadActionIndicator.js
index 5273ab52ec28..ff1090640570 100755
--- a/src/components/UnreadActionIndicator.js
+++ b/src/components/UnreadActionIndicator.js
@@ -10,6 +10,7 @@ function UnreadActionIndicator(props) {
         <View
             accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')}
             data-action-id={props.reportActionID}
+            pointerEvents="none"
             style={[styles.unreadIndicatorContainer, styles.userSelectNone]}
             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.js b/src/components/ValidateCode/ExpiredValidateCodeModal.js
index 449462e88130..e31e0772a8c5 100644
--- a/src/components/ValidateCode/ExpiredValidateCodeModal.js
+++ b/src/components/ValidateCode/ExpiredValidateCodeModal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -33,7 +33,7 @@ function ExpiredValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/JustSignedInModal.js b/src/components/ValidateCode/JustSignedInModal.js
index 40b25e4a19e0..e96505470eba 100644
--- a/src/components/ValidateCode/JustSignedInModal.js
+++ b/src/components/ValidateCode/JustSignedInModal.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -41,7 +41,7 @@ function JustSignedInModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index 344c3107b8cf..eabb21eea4a9 100644
--- a/src/components/ValidateCode/ValidateCodeModal.js
+++ b/src/components/ValidateCode/ValidateCodeModal.js
@@ -4,7 +4,7 @@ import {compose} from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -71,7 +71,7 @@ function ValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/tagPropTypes.js b/src/components/tagPropTypes.js
new file mode 100644
index 000000000000..29d913dcd035
--- /dev/null
+++ b/src/components/tagPropTypes.js
@@ -0,0 +1,12 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.shape({
+    /** Name of a tag */
+    name: PropTypes.string.isRequired,
+
+    /** Flag that determines if a tag is active and able to be selected */
+    enabled: PropTypes.bool.isRequired,
+
+    /** "General Ledger code" that corresponds to this tag in an accounting system. Similar to an ID. */
+    'GL Code': PropTypes.string,
+});
diff --git a/src/components/withTheme.js b/src/components/withTheme.js
new file mode 100644
index 000000000000..99de2a2c7fc7
--- /dev/null
+++ b/src/components/withTheme.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useTheme from '../styles/themes/useTheme';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemePropTypes = {
+    theme: PropTypes.object.isRequired,
+};
+
+export default function withTheme(WrappedComponent) {
+    function WithTheme(props) {
+        const theme = useTheme();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                theme={theme}
+            />
+        );
+    }
+
+    WithTheme.displayName = `withTheme(${getComponentDisplayName(WrappedComponent)})`;
+    WithTheme.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithTheme.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithTheme
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemePropTypes};
diff --git a/src/components/withThemeStyles.js b/src/components/withThemeStyles.js
new file mode 100644
index 000000000000..0320fcb71808
--- /dev/null
+++ b/src/components/withThemeStyles.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useThemeStyles from '../styles/useThemeStyles';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemeStylesPropTypes = {
+    themeStyles: PropTypes.object.isRequired,
+};
+
+export default function withThemeStyles(WrappedComponent) {
+    function WithThemeStyles(props) {
+        const themeStyles = useThemeStyles();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                themeStyles={themeStyles}
+            />
+        );
+    }
+
+    WithThemeStyles.displayName = `withThemeStyles(${getComponentDisplayName(WrappedComponent)})`;
+    WithThemeStyles.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithThemeStyles.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithThemeStyles
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemeStylesPropTypes};
diff --git a/src/languages/en.ts b/src/languages/en.ts
index bd518f1fdda9..03adaa1e66b1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -71,9 +71,20 @@ import type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    TagSelectionParams,
+    TranslationBase,
 } from './types';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 
+type StateValue = {
+    stateISO: string;
+    stateName: string;
+};
+
+type States = Record<keyof typeof COMMON_CONST.STATES, StateValue>;
+
+type AllCountries = Record<keyof typeof CONST.ALL_COUNTRIES, string>;
+
 /* eslint-disable max-len */
 export default {
     common: {
@@ -233,6 +244,7 @@ export default {
         showMore: 'Show more',
         merchant: 'Merchant',
         category: 'Category',
+        tag: 'Tag',
         receipt: 'Receipt',
         replace: 'Replace',
         distance: 'Distance',
@@ -498,6 +510,7 @@ export default {
         pending: 'Pending',
         deleteReceipt: 'Delete receipt',
         receiptScanning: 'Receipt scan in progress…',
+        receiptMissingDetails: 'Receipt missing details',
         receiptStatusTitle: 'Scanning…',
         receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
         requestCount: ({count, scanningReceipts = 0}: RequestCountParams) => `${count} requests${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}`,
@@ -533,6 +546,7 @@ export default {
             `changed the ${valueName} to ${newValueToDisplay} (previously ${oldValueToDisplay})`,
         threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        tagSelection: ({tagName}: TagSelectionParams) => `Select a ${tagName} to add additional organization to your money`,
         error: {
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
@@ -1660,8 +1674,8 @@ export default {
         createAccount: 'Create A New Account',
         logIn: 'Log In',
     },
-    allStates: COMMON_CONST.STATES,
-    allCountries: CONST.ALL_COUNTRIES,
+    allStates: COMMON_CONST.STATES as States,
+    allCountries: CONST.ALL_COUNTRIES as AllCountries,
     accessibilityHints: {
         navigateToChatsList: 'Navigate back to chats list',
         chatWelcomeMessage: 'Chat welcome message',
@@ -1755,4 +1769,4 @@ export default {
             selectSuggestedAddress: 'Please select a suggested address',
         },
     },
-} as const;
+} satisfies TranslationBase;
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3c5d98b724d2..7315c42cebab 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -71,6 +71,8 @@ import type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    TagSelectionParams,
+    EnglishTranslation,
 } from './types';
 
 /* eslint-disable max-len */
@@ -232,6 +234,7 @@ export default {
         showMore: 'Mostrar más',
         merchant: 'Comerciante',
         category: 'Categoría',
+        tag: 'Etiqueta',
         receipt: 'Recibo',
         replace: 'Sustituir',
         distance: 'Distancia',
@@ -499,6 +502,7 @@ export default {
         pending: 'Pendiente',
         deleteReceipt: 'Eliminar recibo',
         receiptScanning: 'Escaneo de recibo en curso…',
+        receiptMissingDetails: 'Recibo con campos vacíos',
         receiptStatusTitle: 'Escaneando…',
         receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
         requestCount: ({count, scanningReceipts = 0}: RequestCountParams) => `${count} solicitudes${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}`,
@@ -535,6 +539,7 @@ export default {
             `cambío ${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
         threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        tagSelection: ({tagName}: TagSelectionParams) => `Seleccione una ${tagName} para organizar mejor tu dinero`,
         error: {
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
@@ -2247,4 +2252,4 @@ export default {
             selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida',
         },
     },
-};
+} satisfies EnglishTranslation;
diff --git a/src/languages/translations.ts b/src/languages/translations.ts
index a2d27baa26c9..d228394589b2 100644
--- a/src/languages/translations.ts
+++ b/src/languages/translations.ts
@@ -1,10 +1,50 @@
 import en from './en';
 import es from './es';
 import esES from './es-ES';
+import type {TranslationBase, TranslationFlatObject} from './types';
+
+/**
+ * Converts an object to it's flattened version.
+ *
+ * Ex:
+ * Input: { common: { yes: "Yes", no: "No" }}
+ * Output: { "common.yes": "Yes", "common.no": "No" }
+ */
+// Necessary to export so that it is accessible to the unit tests
+// eslint-disable-next-line rulesdir/no-inline-named-export
+export function flattenObject(obj: TranslationBase): TranslationFlatObject {
+    const result: Record<string, unknown> = {};
+
+    const recursive = (data: TranslationBase, key: string): void => {
+        // If the data is a function or not a object (eg. a string or array),
+        // it's the final value for the key being built and there is no need
+        // for more recursion
+        if (typeof data === 'function' || Array.isArray(data) || !(typeof data === 'object' && !!data)) {
+            result[key] = data;
+        } else {
+            let isEmpty = true;
+
+            // Recursive call to the keys and connect to the respective data
+            Object.keys(data).forEach((k) => {
+                isEmpty = false;
+                recursive(data[k] as TranslationBase, key ? `${key}.${k}` : k);
+            });
+
+            // Check for when the object is empty but a key exists, so that
+            // it defaults to an empty object
+            if (isEmpty && key) {
+                result[key] = '';
+            }
+        }
+    };
+
+    recursive(obj, '');
+    return result as TranslationFlatObject;
+}
 
 export default {
-    en,
-    es,
+    en: flattenObject(en),
+    es: flattenObject(es),
     // eslint-disable-next-line @typescript-eslint/naming-convention
     'es-ES': esES,
 };
diff --git a/src/languages/types.ts b/src/languages/types.ts
index 7a698f912b14..565b5933b989 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -1,3 +1,5 @@
+import en from './en';
+
 type AddressLineParams = {
     lineNumber: number;
 };
@@ -190,7 +192,50 @@ type RemovedTheRequestParams = {valueName: string; oldValueToDisplay: string};
 
 type UpdatedTheRequestParams = {valueName: string; newValueToDisplay: string; oldValueToDisplay: string};
 
+type TagSelectionParams = {tagName: string};
+
+/* Translation Object types */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type TranslationBaseValue = string | string[] | ((...args: any[]) => string);
+
+type TranslationBase = {[key: string]: TranslationBaseValue | TranslationBase};
+
+/* Flat Translation Object types */
+// Flattens an object and returns concatenations of all the keys of nested objects
+type FlattenObject<TObject, TPrefix extends string = ''> = {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [TKey in keyof TObject]: TObject[TKey] extends (...args: any[]) => any
+        ? `${TPrefix}${TKey & string}`
+        : // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        TObject[TKey] extends any[]
+        ? `${TPrefix}${TKey & string}`
+        : // eslint-disable-next-line @typescript-eslint/ban-types
+        TObject[TKey] extends object
+        ? FlattenObject<TObject[TKey], `${TPrefix}${TKey & string}.`>
+        : `${TPrefix}${TKey & string}`;
+}[keyof TObject];
+
+// Retrieves a type for a given key path (calculated from the type above)
+type TranslateType<TObject, TPath extends string> = TPath extends keyof TObject
+    ? TObject[TPath]
+    : TPath extends `${infer TKey}.${infer TRest}`
+    ? TKey extends keyof TObject
+        ? TranslateType<TObject[TKey], TRest>
+        : never
+    : never;
+
+type EnglishTranslation = typeof en;
+
+type TranslationPaths = FlattenObject<EnglishTranslation>;
+
+type TranslationFlatObject = {
+    [TKey in TranslationPaths]: TranslateType<EnglishTranslation, TKey>;
+};
+
 export type {
+    TranslationBase,
+    EnglishTranslation,
+    TranslationFlatObject,
     AddressLineParams,
     CharacterLimitParams,
     MaxParticipantsReachedParams,
@@ -261,4 +306,5 @@ export type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    TagSelectionParams,
 };
diff --git a/src/libs/Browser/index.js b/src/libs/Browser/index.ts
similarity index 100%
rename from src/libs/Browser/index.js
rename to src/libs/Browser/index.ts
diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.ts
similarity index 88%
rename from src/libs/Browser/index.web.js
rename to src/libs/Browser/index.web.ts
index 32f6392aef76..064358c6bed5 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.ts
@@ -5,12 +5,12 @@ import ROUTES from '../../ROUTES';
 /**
  * Fetch browser name from UA string
  *
- * @return {String} e.g. Chrome
  */
-function getBrowser() {
+function getBrowser(): string {
     const {userAgent} = window.navigator;
-    let match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) || [];
-    let temp;
+    const match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) ?? [];
+    let temp: RegExpMatchArray | null;
+    let browserName = '';
 
     if (/trident/i.test(match[1])) {
         return 'IE';
@@ -28,15 +28,14 @@ function getBrowser() {
         }
     }
 
-    match = match[1] ? match[1] : navigator.appName;
-    return match ? match.toLowerCase() : CONST.BROWSER.OTHER;
+    browserName = match[1] ?? navigator.appName;
+    return browserName ? browserName.toLowerCase() : CONST.BROWSER.OTHER;
 }
 
 /**
  * Whether the platform is a mobile browser.
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
  *
- * @returns {Boolean}
  */
 function isMobile() {
     return /Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Silk|Opera Mini/i.test(navigator.userAgent);
@@ -45,7 +44,6 @@ function isMobile() {
 /**
  * Checks if requesting user agent is Safari browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileSafari() {
     const userAgent = navigator.userAgent;
@@ -55,7 +53,6 @@ function isMobileSafari() {
 /**
  * Checks if requesting user agent is Chrome browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileChrome() {
     const userAgent = navigator.userAgent;
@@ -68,8 +65,6 @@ function isSafari() {
 
 /**
  * The session information needs to be passed to the Desktop app, and the only way to do that is by using query params. There is no other way to transfer the data.
- * @param {String} shortLivedAuthToken
- * @param {String} email
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
@@ -95,8 +90,9 @@ function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
         document.body.appendChild(iframe);
-        iframe.contentWindow.location.href = expensifyDeeplinkUrl;
-
+        if (iframe.contentWindow) {
+            iframe.contentWindow.location.href = expensifyDeeplinkUrl;
+        }
         // Since we're creating an iframe for Safari to handle deeplink,
         // we need to give Safari some time to open the pop-up window.
         // After that we can just remove the iframe.
diff --git a/src/libs/CollectionUtils.js b/src/libs/CollectionUtils.js
deleted file mode 100644
index 3625c68d2c39..000000000000
--- a/src/libs/CollectionUtils.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import _ from 'underscore';
-
-/**
- * Return the highest item in a numbered collection
- *
- * e.g. {1: '1', 2: '2', 3: '3'} -> '3'
- *
- * @param {Object} object
- * @returns {*}
- */
-function lastItem(object = {}) {
-    const lastKey = _.last(_.keys(object)) || 0;
-    return object[lastKey];
-}
-
-/**
- * Used to grab the id for a particular collection item's key.
- * e.g. reportActions_1 -> 1
- *
- * @param {String} key
- * @returns {String}
- */
-function extractCollectionItemID(key) {
-    return key.split('_')[1];
-}
-
-export {lastItem, extractCollectionItemID};
diff --git a/src/libs/CollectionUtils.ts b/src/libs/CollectionUtils.ts
new file mode 100644
index 000000000000..ac47633c2e08
--- /dev/null
+++ b/src/libs/CollectionUtils.ts
@@ -0,0 +1,23 @@
+import {OnyxCollectionKey} from '../ONYXKEYS';
+
+/**
+ * Return the highest item in a numbered collection
+ *
+ * e.g. {1: '1', 2: '2', 3: '3'} -> '3'
+ *
+ * Use this only for collections that are numbered in other cases it will return the last item in the object not the highest
+ */
+function lastItem<T>(object: Record<string, T> = {}): T | undefined {
+    const lastKey = Object.keys(object).pop() ?? 0;
+    return object[lastKey];
+}
+
+/**
+ * Used to grab the id for a particular collection item's key.
+ * e.g. reportActions_1 -> 1
+ */
+function extractCollectionItemID(key: `${OnyxCollectionKey}${string}`): string {
+    return key.split('_')[1];
+}
+
+export {lastItem, extractCollectionItemID};
diff --git a/src/libs/DistanceRequestUtils.js b/src/libs/DistanceRequestUtils.js
index 25f26cc92b52..51e37530465d 100644
--- a/src/libs/DistanceRequestUtils.js
+++ b/src/libs/DistanceRequestUtils.js
@@ -91,7 +91,8 @@ const getDistanceMerchant = (distanceInMeters, unit, rate, currency, translate)
  */
 const getDistanceRequestAmount = (distance, unit, rate) => {
     const convertedDistance = convertDistanceUnit(distance, unit);
-    return convertedDistance * rate;
+    const roundedDistance = convertedDistance.toFixed(2);
+    return roundedDistance * rate;
 };
 
 export default {getDefaultMileageRate, getDistanceMerchant, getDistanceRequestAmount};
diff --git a/src/libs/GetStyledTextArray.js b/src/libs/GetStyledTextArray.ts
similarity index 86%
rename from src/libs/GetStyledTextArray.js
rename to src/libs/GetStyledTextArray.ts
index 576e6f98c94b..cdcedbac2a4f 100644
--- a/src/libs/GetStyledTextArray.js
+++ b/src/libs/GetStyledTextArray.ts
@@ -1,12 +1,11 @@
 import Str from 'expensify-common/lib/str';
 
-/**
- * Render a suggestion menu item component.
- * @param {String} name
- * @param {String} prefix
- * @returns {Array}
- */
-const getStyledTextArray = (name, prefix) => {
+type StyledText = {
+    text: string;
+    isColored: boolean;
+};
+
+const getStyledTextArray = (name: string, prefix: string): StyledText[] => {
     const texts = [];
     const prefixLowercase = prefix.toLowerCase();
     const prefixLocation = name.toLowerCase().search(Str.escapeForRegExp(prefixLowercase));
diff --git a/src/libs/Growl.js b/src/libs/Growl.js
deleted file mode 100644
index 81994dd4c255..000000000000
--- a/src/libs/Growl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import CONST from '../CONST';
-
-const growlRef = React.createRef();
-let resolveIsReadyPromise;
-const isReadyPromise = new Promise((resolve) => {
-    resolveIsReadyPromise = resolve;
-});
-
-function setIsReady() {
-    resolveIsReadyPromise();
-}
-
-/**
- * Show the growl notification
- *
- * @param {String} bodyText
- * @param {String} type
- * @param {Number} [duration]
- */
-function show(bodyText, type, duration = CONST.GROWL.DURATION) {
-    isReadyPromise.then(() => growlRef.current.show(bodyText, type, duration));
-}
-
-/**
- * Show error growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function error(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.ERROR, duration);
-}
-
-/**
- * Show success growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function success(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.SUCCESS, duration);
-}
-
-export default {
-    show,
-    error,
-    success,
-};
-
-export {growlRef, setIsReady};
diff --git a/src/libs/Growl.ts b/src/libs/Growl.ts
new file mode 100644
index 000000000000..99c728f0a210
--- /dev/null
+++ b/src/libs/Growl.ts
@@ -0,0 +1,49 @@
+import React from 'react';
+import CONST from '../CONST';
+
+type GrowlRef = {
+    show?: (bodyText: string, type: string, duration: number) => void;
+};
+
+const growlRef = React.createRef<GrowlRef>();
+let resolveIsReadyPromise: undefined | ((value?: unknown) => void);
+const isReadyPromise = new Promise((resolve) => {
+    resolveIsReadyPromise = resolve;
+});
+
+function setIsReady() {
+    if (!resolveIsReadyPromise) return;
+    resolveIsReadyPromise();
+}
+
+/**
+ * Show the growl notification
+ */
+function show(bodyText: string, type: string, duration: number = CONST.GROWL.DURATION) {
+    isReadyPromise.then(() => {
+        if (!growlRef?.current?.show) return;
+        growlRef.current.show(bodyText, type, duration);
+    });
+}
+
+/**
+ * Show error growl
+ */
+function error(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.ERROR, duration);
+}
+
+/**
+ * Show success growl
+ */
+function success(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.SUCCESS, duration);
+}
+
+export default {
+    show,
+    error,
+    success,
+};
+
+export {growlRef, setIsReady};
diff --git a/src/libs/IntlPolyfill/index.js b/src/libs/IntlPolyfill/index.js
index 3925b98729a9..a99fc4cfed44 100644
--- a/src/libs/IntlPolyfill/index.js
+++ b/src/libs/IntlPolyfill/index.js
@@ -7,4 +7,5 @@ import polyfillNumberFormat from './polyfillNumberFormat';
 export default function intlPolyfill() {
     // Just need to polyfill Intl.NumberFormat for web based platforms
     polyfillNumberFormat();
+    require('@formatjs/intl-datetimeformat');
 }
diff --git a/src/libs/IntlPolyfill/index.native.js b/src/libs/IntlPolyfill/index.native.js
index a628654fefea..4fb5ca585e25 100644
--- a/src/libs/IntlPolyfill/index.native.js
+++ b/src/libs/IntlPolyfill/index.native.js
@@ -9,6 +9,7 @@ export default function polyfill() {
     require('@formatjs/intl-getcanonicallocales/polyfill');
     require('@formatjs/intl-locale/polyfill');
     require('@formatjs/intl-pluralrules/polyfill');
+    require('@formatjs/intl-datetimeformat');
     polyfillNumberFormat();
     polyfillListFormat();
 }
diff --git a/src/libs/LocaleDigitUtils.js b/src/libs/LocaleDigitUtils.ts
similarity index 68%
rename from src/libs/LocaleDigitUtils.js
rename to src/libs/LocaleDigitUtils.ts
index 23396f8d2fb6..e17620aa5427 100644
--- a/src/libs/LocaleDigitUtils.js
+++ b/src/libs/LocaleDigitUtils.ts
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import _ from 'lodash';
 
 import * as NumberFormatUtils from './NumberFormatUtils';
 
@@ -8,12 +8,12 @@ const INDEX_DECIMAL = 10;
 const INDEX_MINUS_SIGN = 11;
 const INDEX_GROUP = 12;
 
-const getLocaleDigits = _.memoize((locale) => {
-    const localeDigits = _.clone(STANDARD_DIGITS);
+const getLocaleDigits = _.memoize((locale: string): string[] => {
+    const localeDigits = [...STANDARD_DIGITS];
     for (let i = 0; i <= 9; i++) {
         localeDigits[i] = NumberFormatUtils.format(locale, i);
     }
-    _.forEach(NumberFormatUtils.formatToParts(locale, 1000000.5), (part) => {
+    NumberFormatUtils.formatToParts(locale, 1000000.5).forEach((part) => {
         switch (part.type) {
             case 'decimal':
                 localeDigits[INDEX_DECIMAL] = part.value;
@@ -34,15 +34,13 @@ const getLocaleDigits = _.memoize((locale) => {
 /**
  * Gets the locale digit corresponding to a standard digit.
  *
- * @param {String} locale
- * @param {String} digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
+ * @param digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
  * "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `digit` is not a valid standard digit.
  */
-function toLocaleDigit(locale, digit) {
-    const index = _.indexOf(STANDARD_DIGITS, digit);
+function toLocaleDigit(locale: string, digit: string): string {
+    const index = STANDARD_DIGITS.indexOf(digit);
     if (index < 0) {
         throw new Error(`"${digit}" must be in ${JSON.stringify(STANDARD_DIGITS)}`);
     }
@@ -52,15 +50,13 @@ function toLocaleDigit(locale, digit) {
 /**
  * Gets the standard digit corresponding to a locale digit.
  *
- * @param {String} locale
- * @param {String} localeDigit - Character of a single locale digit. It may be **the localized version** of
+ * @param localeDigit - Character of a single locale digit. It may be **the localized version** of
  * "0" ~ "9" (digits), "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `localeDigit` is not a valid locale digit.
  */
-function fromLocaleDigit(locale, localeDigit) {
-    const index = _.indexOf(getLocaleDigits(locale), localeDigit);
+function fromLocaleDigit(locale: string, localeDigit: string): string {
+    const index = getLocaleDigits(locale).indexOf(localeDigit);
     if (index < 0) {
         throw new Error(`"${localeDigit}" must be in ${JSON.stringify(getLocaleDigits(locale))}`);
     }
diff --git a/src/libs/Localize/index.js b/src/libs/Localize/index.js
index 9878873377b8..db371301f43f 100644
--- a/src/libs/Localize/index.js
+++ b/src/libs/Localize/index.js
@@ -38,7 +38,7 @@ function init() {
  * Return translated string for given locale and phrase
  *
  * @param {String} [desiredLanguage] eg 'en', 'es-ES'
- * @param {String|Array} phraseKey
+ * @param {String} phraseKey
  * @param {Object} [phraseParameters] Parameters to supply if the phrase is a template literal.
  * @returns {String}
  */
@@ -47,15 +47,15 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     let translatedPhrase;
 
     // Search phrase in full locale e.g. es-ES
-    const desiredLanguageDictionary = lodashGet(translations, desiredLanguage);
-    translatedPhrase = lodashGet(desiredLanguageDictionary, phraseKey);
+    const desiredLanguageDictionary = translations[desiredLanguage] || {};
+    translatedPhrase = desiredLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
 
     // Phrase is not found in full locale, search it in fallback language e.g. es
-    const fallbackLanguageDictionary = lodashGet(translations, languageAbbreviation);
-    translatedPhrase = lodashGet(fallbackLanguageDictionary, phraseKey);
+    const fallbackLanguageDictionary = translations[languageAbbreviation] || {};
+    translatedPhrase = fallbackLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
@@ -64,8 +64,8 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     }
 
     // Phrase is not translated, search it in default language (en)
-    const defaultLanguageDictionary = lodashGet(translations, CONST.LOCALES.DEFAULT, {});
-    translatedPhrase = lodashGet(defaultLanguageDictionary, phraseKey);
+    const defaultLanguageDictionary = translations[CONST.LOCALES.DEFAULT] || {};
+    translatedPhrase = defaultLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
diff --git a/src/libs/Metrics/index.js b/src/libs/Metrics/index.js
deleted file mode 100644
index 2c90f1c51b65..000000000000
--- a/src/libs/Metrics/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import CONFIG from '../../CONFIG';
-
-// We don't capture performance metrics on web as there are enough tools available
-const canCapturePerformanceMetrics = () => false;
-
-const canCaptureOnyxMetrics = () => Boolean(CONFIG.ONYX_METRICS);
-
-export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.native.js b/src/libs/Metrics/index.native.js
deleted file mode 100644
index f57526e674ba..000000000000
--- a/src/libs/Metrics/index.native.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import CONFIG from '../../CONFIG';
-
-/**
- * Is capturing performance stats enabled.
- *
- * @returns {Boolean}
- */
-const canCapturePerformanceMetrics = () => CONFIG.CAPTURE_METRICS;
-
-/**
- * Is capturing Onyx stats enabled.
- *
- * @returns {Boolean}
- */
-const canCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
-
-export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.native.ts b/src/libs/Metrics/index.native.ts
new file mode 100644
index 000000000000..526e5c57a269
--- /dev/null
+++ b/src/libs/Metrics/index.native.ts
@@ -0,0 +1,14 @@
+import CONFIG from '../../CONFIG';
+import {CanCaptureOnyxMetrics, CanCapturePerformanceMetrics} from './types';
+
+/**
+ * Is capturing performance stats enabled.
+ */
+const canCapturePerformanceMetrics: CanCapturePerformanceMetrics = () => CONFIG.CAPTURE_METRICS;
+
+/**
+ * Is capturing Onyx stats enabled.
+ */
+const canCaptureOnyxMetrics: CanCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
+
+export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/index.ts b/src/libs/Metrics/index.ts
new file mode 100644
index 000000000000..7c33f31cb19e
--- /dev/null
+++ b/src/libs/Metrics/index.ts
@@ -0,0 +1,9 @@
+import CONFIG from '../../CONFIG';
+import {CanCaptureOnyxMetrics, CanCapturePerformanceMetrics} from './types';
+
+// We don't capture performance metrics on web as there are enough tools available
+const canCapturePerformanceMetrics: CanCapturePerformanceMetrics = () => false;
+
+const canCaptureOnyxMetrics: CanCaptureOnyxMetrics = () => CONFIG.ONYX_METRICS;
+
+export {canCapturePerformanceMetrics, canCaptureOnyxMetrics};
diff --git a/src/libs/Metrics/types.ts b/src/libs/Metrics/types.ts
new file mode 100644
index 000000000000..61b1400ae9f8
--- /dev/null
+++ b/src/libs/Metrics/types.ts
@@ -0,0 +1,4 @@
+type CanCapturePerformanceMetrics = () => boolean;
+type CanCaptureOnyxMetrics = () => boolean;
+
+export type {CanCapturePerformanceMetrics, CanCaptureOnyxMetrics};
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 34dc089a621f..37b7087b6ad4 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import Onyx, {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import moment from 'moment';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
@@ -65,7 +64,7 @@ Onyx.connect({
         }
 
         timezone = lodashGet(val, [currentAccountID, 'timezone'], {});
-        const currentTimezone = moment.tz.guess(true);
+        const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic
         // then update their timezone.
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 2adaf0397a2c..6b83fe2dcbb8 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -90,6 +90,13 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([
         },
         name: 'Money_Request_Category',
     },
+    {
+        getComponent: () => {
+            const MoneyRequestTagPage = require('../../../pages/iou/MoneyRequestTagPage').default;
+            return MoneyRequestTagPage;
+        },
+        name: 'Money_Request_Tag',
+    },
     {
         getComponent: () => {
             const MoneyRequestMerchantPage = require('../../../pages/iou/MoneyRequestMerchantPage').default;
@@ -125,6 +132,13 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([
         },
         name: 'Money_Request_Waypoint',
     },
+    {
+        getComponent: () => {
+            const DistanceRequestEditPage = require('../../../pages/iou/DistanceRequestPage').default;
+            return DistanceRequestEditPage;
+        },
+        name: 'Money_Request_Address',
+    },
 ]);
 
 const SplitDetailsModalStackNavigator = createModalStackNavigator([
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index ee3054e02f96..a15daf992836 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -265,7 +265,7 @@ export default {
                     },
                     TeachersUnite: {
                         screens: {
-                            SaveTheWorld_Root: ROUTES.SAVE_THE_WORLD,
+                            SaveTheWorld_Root: ROUTES.TEACHERS_UNITE,
                             I_Know_A_Teacher: ROUTES.I_KNOW_A_TEACHER,
                             Intro_School_Principal: ROUTES.INTRO_SCHOOL_PRINCIPAL,
                             I_Am_A_Teacher: ROUTES.I_AM_A_TEACHER,
@@ -318,8 +318,10 @@ export default {
                             Money_Request_Currency: ROUTES.MONEY_REQUEST_CURRENCY,
                             Money_Request_Description: ROUTES.MONEY_REQUEST_DESCRIPTION,
                             Money_Request_Category: ROUTES.MONEY_REQUEST_CATEGORY,
+                            Money_Request_Tag: ROUTES.MONEY_REQUEST_TAG,
                             Money_Request_Merchant: ROUTES.MONEY_REQUEST_MERCHANT,
                             Money_Request_Waypoint: ROUTES.MONEY_REQUEST_WAYPOINT,
+                            Money_Request_Address: ROUTES.MONEY_REQUEST_ADDRESS,
                             IOU_Send_Enable_Payments: ROUTES.IOU_SEND_ENABLE_PAYMENTS,
                             IOU_Send_Add_Bank_Account: ROUTES.IOU_SEND_ADD_BANK_ACCOUNT,
                             IOU_Send_Add_Debit_Card: ROUTES.IOU_SEND_ADD_DEBIT_CARD,
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index d26ad48430b0..7629a1acc0a6 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -652,12 +652,8 @@ function getCategoryOptionTree(options, isOneLine = false) {
 /**
  * Build the section list for categories
  *
- * @param {Object[]} categories
- * @param {String} categories[].name
- * @param {Boolean} categories[].enabled
- * @param {Object[]} recentlyUsedCategories
- * @param {String} recentlyUsedCategories[].name
- * @param {Boolean} recentlyUsedCategories[].enabled
+ * @param {Object<String, {name: String, enabled: Boolean}>} categories
+ * @param {String[]} recentlyUsedCategories
  * @param {Object[]} selectedOptions
  * @param {String} selectedOptions[].name
  * @param {String} searchInputValue
@@ -666,11 +662,12 @@ function getCategoryOptionTree(options, isOneLine = false) {
  */
 function getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow) {
     const categorySections = [];
-    const numberOfCategories = _.size(categories);
+    const categoriesValues = _.values(categories);
+    const numberOfCategories = _.size(categoriesValues);
     let indexOffset = 0;
 
     if (!_.isEmpty(searchInputValue)) {
-        const searchCategories = _.filter(categories, (category) => category.name.toLowerCase().includes(searchInputValue.toLowerCase()));
+        const searchCategories = _.filter(categoriesValues, (category) => category.name.toLowerCase().includes(searchInputValue.toLowerCase()));
 
         categorySections.push({
             // "Search" section
@@ -689,15 +686,21 @@ function getCategoryListSections(categories, recentlyUsedCategories, selectedOpt
             title: '',
             shouldShow: false,
             indexOffset,
-            data: getCategoryOptionTree(categories),
+            data: getCategoryOptionTree(categoriesValues),
         });
 
         return categorySections;
     }
 
     const selectedOptionNames = _.map(selectedOptions, (selectedOption) => selectedOption.name);
-    const filteredRecentlyUsedCategories = _.filter(recentlyUsedCategories, (category) => !_.includes(selectedOptionNames, category.name));
-    const filteredCategories = _.filter(categories, (category) => !_.includes(selectedOptionNames, category.name));
+    const filteredRecentlyUsedCategories = _.map(
+        _.filter(recentlyUsedCategories, (category) => !_.includes(selectedOptionNames, category)),
+        (category) => ({
+            name: category,
+            enabled: lodashGet(categories, `${category}.enabled`, false),
+        }),
+    );
+    const filteredCategories = _.filter(categoriesValues, (category) => !_.includes(selectedOptionNames, category.name));
 
     if (!_.isEmpty(selectedOptions)) {
         categorySections.push({
@@ -776,7 +779,7 @@ function getOptions(
     },
 ) {
     if (includeCategories) {
-        const categoryOptions = getCategoryListSections(_.values(categories), recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow);
+        const categoryOptions = getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow);
 
         return {
             recentReports: [],
@@ -1127,7 +1130,7 @@ function getIOUConfirmationOptionsFromParticipants(participants, amountText) {
  * @param {boolean} [includeP2P]
  * @param {boolean} [includeCategories]
  * @param {Object} [categories]
- * @param {Array<Object>} [recentlyUsedCategories]
+ * @param {Array<String>} [recentlyUsedCategories]
  * @param {boolean} [canInviteUser]
  * @returns {Object}
  */
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index f37cd5bb5bf3..0294236b1cd7 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -86,6 +86,22 @@ function canUseCustomStatus(betas) {
     return _.contains(betas, CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
 }
 
+/**
+ * @param {Array<String>} betas
+ * @returns {Boolean}
+ */
+function canUseCategories(betas) {
+    return _.contains(betas, CONST.BETAS.NEW_DOT_CATEGORIES) || canUseAllBetas(betas);
+}
+
+/**
+ * @param {Array<String>} betas
+ * @returns {Boolean}
+ */
+function canUseTags(betas) {
+    return _.contains(betas, CONST.BETAS.NEW_DOT_TAGS) || canUseAllBetas(betas);
+}
+
 /**
  * Link previews are temporarily disabled.
  * @returns {Boolean}
@@ -104,5 +120,7 @@ export default {
     canUsePolicyRooms,
     canUseTasks,
     canUseCustomStatus,
+    canUseCategories,
+    canUseTags,
     canUseLinkPreviews,
 };
diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
index f7a53227d8d7..d90a6cbf0e37 100644
--- a/src/libs/ReceiptUtils.js
+++ b/src/libs/ReceiptUtils.js
@@ -4,7 +4,6 @@ import Str from 'expensify-common/lib/str';
 import * as FileUtils from './fileDownload/FileUtils';
 import CONST from '../CONST';
 import Receipt from './actions/Receipt';
-import * as Localize from './Localize';
 import ReceiptHTML from '../../assets/images/receipt-html.png';
 import ReceiptDoc from '../../assets/images/receipt-doc.png';
 import ReceiptGeneric from '../../assets/images/receipt-generic.png';
@@ -13,17 +12,17 @@ import ReceiptSVG from '../../assets/images/receipt-svg.png';
 function validateReceipt(file) {
     const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));
     if (_.contains(CONST.API_ATTACHMENT_VALIDATIONS.UNALLOWED_EXTENSIONS, fileExtension.toLowerCase())) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.wrongFileType'), Localize.translateLocal('attachmentPicker.notAllowedExtension'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.wrongFileType', 'attachmentPicker.notAllowedExtension');
         return false;
     }
 
     if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.attachmentTooLarge'), Localize.translateLocal('attachmentPicker.sizeExceeded'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.attachmentTooLarge', 'attachmentPicker.sizeExceeded');
         return false;
     }
 
     if (lodashGet(file, 'size', 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.attachmentTooSmall'), Localize.translateLocal('attachmentPicker.sizeNotMet'));
+        Receipt.setUploadReceiptError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet');
         return false;
     }
 
diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 9bb365c0f42a..fde847bd9bfc 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -370,7 +370,10 @@ function shouldReportActionBeVisibleAsLastAction(reportAction) {
         return false;
     }
 
-    return shouldReportActionBeVisible(reportAction, reportAction.reportActionID) && !isWhisperAction(reportAction) && !isDeletedAction(reportAction);
+    // If a whisper action is the REPORTPREVIEW action, we are displaying it.
+    return (
+        shouldReportActionBeVisible(reportAction, reportAction.reportActionID) && !(isWhisperAction(reportAction) && !isReportPreviewAction(reportAction)) && !isDeletedAction(reportAction)
+    );
 }
 
 /**
@@ -401,7 +404,7 @@ function getLastVisibleMessage(reportID, actionsToMerge = {}) {
     if (isReportMessageAttachment(message)) {
         return {
             lastMessageTranslationKey: CONST.TRANSLATION_KEYS.ATTACHMENT,
-            lastMessageText: CONST.TRANSLATION_KEYS.ATTACHMENT,
+            lastMessageText: CONST.ATTACHMENT_MESSAGE_TEXT,
             lastMessageHtml: CONST.TRANSLATION_KEYS.ATTACHMENT,
         };
     }
@@ -616,6 +619,17 @@ function getAllReportActions(reportID) {
     return lodashGet(allReportActions, reportID, []);
 }
 
+/**
+ * Check whether a report action is an attachment (a file, such as an image or a zip).
+ *
+ * @param {Object} reportAction report action
+ * @returns {Boolean}
+ */
+function isReportActionAttachment(reportAction) {
+    const message = _.first(lodashGet(reportAction, 'message', [{}]));
+    return _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : isReportMessageAttachment(message);
+}
+
 export {
     getSortedReportActions,
     getLastVisibleAction,
@@ -653,4 +667,5 @@ export {
     isSplitBillAction,
     isTaskAction,
     getAllReportActions,
+    isReportActionAttachment,
 };
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 8b84555ca2a9..f24959c4bac2 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1286,6 +1286,7 @@ function getTransactionDetails(transaction) {
         currency: TransactionUtils.getCurrency(transaction),
         comment: TransactionUtils.getDescription(transaction),
         merchant: TransactionUtils.getMerchant(transaction),
+        category: TransactionUtils.getCategory(transaction),
     };
 }
 
@@ -1399,6 +1400,10 @@ function getTransactionReportName(reportAction) {
         return Localize.translateLocal('iou.receiptScanning');
     }
 
+    if (TransactionUtils.hasMissingSmartscanFields(transaction)) {
+        return Localize.translateLocal('iou.receiptMissingDetails');
+    }
+
     const {amount, currency, comment} = getTransactionDetails(transaction);
 
     return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadRequestReportName', {
@@ -1601,7 +1606,7 @@ function getReportName(report, policy = undefined) {
             return getTransactionReportName(parentReportAction);
         }
 
-        const isAttachment = _.has(parentReportAction, 'isAttachment') ? parentReportAction.isAttachment : isReportMessageAttachment(_.last(lodashGet(parentReportAction, 'message', [{}])));
+        const isAttachment = ReportActionsUtils.isReportActionAttachment(parentReportAction);
         const parentReportActionMessage = lodashGet(parentReportAction, ['message', 0, 'text'], '').replace(/(\r\n|\n|\r)/gm, ' ');
         if (isAttachment && parentReportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;
@@ -2622,7 +2627,7 @@ function buildTransactionThread(reportAction, moneyRequestReportID) {
         participantAccountIDs,
         getTransactionReportName(reportAction),
         '',
-        lodashGet(getReport(reportAction.reportID), 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
+        lodashGet(getReport(moneyRequestReportID), 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
         CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
         false,
         '',
@@ -3104,8 +3109,8 @@ function getMoneyRequestOptions(report, reportParticipants, betas) {
         return [];
     }
 
-    // Additional requests should be blocked for money request reports
-    if (isMoneyRequestReport(report)) {
+    // Additional requests should be blocked for money request reports if it is approved or reimbursed
+    if (isMoneyRequestReport(report) && (isReportApproved(report) || isSettled(report.reportID))) {
         return [];
     }
 
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 8cdb0c0271e6..4ca8b48d284e 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -33,6 +33,7 @@ Onyx.connect({
  * @param {Object} [receipt]
  * @param {String} [filename]
  * @param {String} [existingTransactionID] When creating a distance request, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have it's transactionID match what was already generated.
+ * @param {String} [category]
  * @returns {Object}
  */
 function buildOptimisticTransaction(
@@ -47,6 +48,7 @@ function buildOptimisticTransaction(
     receipt = {},
     filename = '',
     existingTransactionID = null,
+    category = '',
 ) {
     // transactionIDs are random, positive, 64-bit numeric strings.
     // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
@@ -74,6 +76,7 @@ function buildOptimisticTransaction(
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,
         filename,
+        category,
     };
 }
 
@@ -228,6 +231,16 @@ function getMerchant(transaction) {
     return lodashGet(transaction, 'modifiedMerchant', null) || lodashGet(transaction, 'merchant', '');
 }
 
+/**
+ * Return the category from the transaction. This "category" field has no "modified" complement.
+ *
+ * @param {Object} transaction
+ * @return {String}
+ */
+function getCategory(transaction) {
+    return lodashGet(transaction, 'category', '');
+}
+
 /**
  * Return the created field from the transaction, return the modifiedCreated if present.
  *
@@ -362,6 +375,7 @@ export {
     getCurrency,
     getMerchant,
     getCreated,
+    getCategory,
     getLinkedTransaction,
     getAllReportTransactions,
     hasReceipt,
diff --git a/src/libs/VisualViewport/index.native.js b/src/libs/VisualViewport/index.native.ts
similarity index 50%
rename from src/libs/VisualViewport/index.native.js
rename to src/libs/VisualViewport/index.native.ts
index c228119b064c..a50b080d9aab 100644
--- a/src/libs/VisualViewport/index.native.js
+++ b/src/libs/VisualViewport/index.native.ts
@@ -1,10 +1,8 @@
+import AddViewportResizeListener from './types';
+
 /**
  * Visual Viewport is not available on native, so return an empty function.
- *
- * @returns {Function}
  */
-function addViewportResizeListener() {
-    return () => {};
-}
+const addViewportResizeListener: AddViewportResizeListener = () => () => {};
 
 export default addViewportResizeListener;
diff --git a/src/libs/VisualViewport/index.js b/src/libs/VisualViewport/index.ts
similarity index 55%
rename from src/libs/VisualViewport/index.js
rename to src/libs/VisualViewport/index.ts
index cc6be038209c..e24d42f272a4 100644
--- a/src/libs/VisualViewport/index.js
+++ b/src/libs/VisualViewport/index.ts
@@ -1,16 +1,15 @@
+import AddViewportResizeListener from './types';
+
 /**
  * Add a visual viewport resize listener if available. Return a function to remove the listener.
- *
- * @param {Function} onViewportResize
- * @returns {Function}
  */
-function addViewportResizeListener(onViewportResize) {
+const addViewportResizeListener: AddViewportResizeListener = (onViewportResize) => {
     if (!window.visualViewport) {
         return () => {};
     }
 
     window.visualViewport.addEventListener('resize', onViewportResize);
-    return () => window.visualViewport.removeEventListener('resize', onViewportResize);
-}
+    return () => window.visualViewport?.removeEventListener('resize', onViewportResize);
+};
 
 export default addViewportResizeListener;
diff --git a/src/libs/VisualViewport/types.ts b/src/libs/VisualViewport/types.ts
new file mode 100644
index 000000000000..da8360d72a35
--- /dev/null
+++ b/src/libs/VisualViewport/types.ts
@@ -0,0 +1,3 @@
+type AddViewportResizeListener = (onViewportResize: (e: Event) => void) => () => void;
+
+export default AddViewportResizeListener;
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 645670c880d9..fffe43b88ee9 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -1,5 +1,3 @@
-import moment from 'moment-timezone';
-import 'moment/locale/es';
 import {AppState} from 'react-native';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -386,7 +384,7 @@ function openProfile(personalDetails) {
     if (lodashGet(oldTimezoneData, 'automatic', true)) {
         newTimezoneData = {
             automatic: true,
-            selected: moment.tz.guess(true),
+            selected: Intl.DateTimeFormat().resolvedOptions().timeZone,
         };
     }
 
diff --git a/src/libs/actions/CurrentDate.js b/src/libs/actions/CurrentDate.ts
similarity index 74%
rename from src/libs/actions/CurrentDate.js
rename to src/libs/actions/CurrentDate.ts
index 078b35a760cb..b19a3430e96f 100644
--- a/src/libs/actions/CurrentDate.js
+++ b/src/libs/actions/CurrentDate.ts
@@ -1,10 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {String} currentDate
- */
-function setCurrentDate(currentDate) {
+function setCurrentDate(currentDate: string) {
     Onyx.set(ONYXKEYS.CURRENT_DATE, currentDate);
 }
 
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 2102ed9223c8..c5c6b03f3d44 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -22,6 +22,7 @@ import * as UserUtils from '../UserUtils';
 import * as Report from './Report';
 import * as NumberUtils from '../NumberUtils';
 import ReceiptGeneric from '../../../assets/images/receipt-generic.png';
+import * as LocalePhoneNumber from '../LocalePhoneNumber';
 
 let allReports;
 Onyx.connect({
@@ -44,6 +45,13 @@ Onyx.connect({
     },
 });
 
+let allRecentlyUsedCategories = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allRecentlyUsedCategories = val),
+});
+
 let userAccountID = '';
 let currentUserEmail = '';
 Onyx.connect({
@@ -83,6 +91,7 @@ function resetMoneyRequestInfo(id = '') {
         comment: '',
         participants: [],
         merchant: CONST.TRANSACTION.DEFAULT_MERCHANT,
+        category: '',
         created,
         receiptPath: '',
         receiptSource: '',
@@ -99,6 +108,7 @@ function buildOnyxDataForMoneyRequest(
     iouAction,
     optimisticPersonalDetailListAction,
     reportPreviewAction,
+    optimisticRecentlyUsedCategories,
     isNewChatReport,
     isNewIOUReport,
 ) {
@@ -148,6 +158,14 @@ function buildOnyxDataForMoneyRequest(
         },
     ];
 
+    if (!_.isEmpty(optimisticRecentlyUsedCategories)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`,
+            value: optimisticRecentlyUsedCategories,
+        });
+    }
+
     if (!_.isEmpty(optimisticPersonalDetailListAction)) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
@@ -319,6 +337,8 @@ function buildOnyxDataForMoneyRequest(
  * @param {Number} [payeeAccountID]
  * @param {String} [payeeEmail]
  * @param {Object} [receipt]
+ * @param {String} [existingTransactionID]
+ * @param {String} [category]
  * @returns {Object} data
  * @returns {String} data.payerEmail
  * @returns {Object} data.iouReport
@@ -332,7 +352,6 @@ function buildOnyxDataForMoneyRequest(
  * @returns {Object} data.onyxData.optimisticData
  * @returns {Object} data.onyxData.successData
  * @returns {Object} data.onyxData.failureData
- * @param {String} [existingTransactionID]
  */
 function getMoneyRequestInformation(
     report,
@@ -345,7 +364,8 @@ function getMoneyRequestInformation(
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     receipt = undefined,
-    existingTransactionID = null,
+    existingTransactionID = undefined,
+    category = undefined,
 ) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
@@ -410,8 +430,17 @@ function getMoneyRequestInformation(
         receiptObject,
         filename,
         existingTransactionID,
+        category,
     );
 
+    const uniquePolicyRecentlyUsedCategories = allRecentlyUsedCategories
+        ? _.filter(
+              allRecentlyUsedCategories[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`],
+              (recentlyUsedPolicyCategory) => recentlyUsedPolicyCategory !== category,
+          )
+        : [];
+    const optimisticPolicyRecentlyUsedCategories = [category, ...uniquePolicyRecentlyUsedCategories];
+
     // If there is an existing transaction (which is the case for distance requests), then the data from the existing transaction
     // needs to be manually merged into the optimistic transaction. This is because buildOnyxDataForMoneyRequest() uses `Onyx.set()` for the transaction
     // data. This is a big can of worms to change it to `Onyx.merge()` as explored in https://expensify.slack.com/archives/C05DWUDHVK7/p1692139468252109.
@@ -464,8 +493,8 @@ function getMoneyRequestInformation(
               [payerAccountID]: {
                   accountID: payerAccountID,
                   avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
-                  displayName: participant.displayName || participant.login,
-                  login: payerEmail,
+                  displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || payerEmail),
+                  login: participant.login,
               },
           }
         : undefined;
@@ -480,6 +509,7 @@ function getMoneyRequestInformation(
         iouAction,
         optimisticPersonalDetailListAction,
         reportPreviewAction,
+        optimisticPolicyRecentlyUsedCategories,
         isNewChatReport,
         isNewIOUReport,
     );
@@ -509,11 +539,12 @@ function getMoneyRequestInformation(
  * @param {String} comment
  * @param {String} created
  * @param {String} [transactionID]
+ * @param {String} [category]
  * @param {Number} amount
  * @param {String} currency
  * @param {String} merchant
  */
-function createDistanceRequest(report, participant, comment, created, transactionID, amount, currency, merchant) {
+function createDistanceRequest(report, participant, comment, created, transactionID, category, amount, currency, merchant) {
     const optimisticReceipt = {
         source: ReceiptGeneric,
         state: CONST.IOU.RECEIPT_STATE.OPEN,
@@ -530,6 +561,7 @@ function createDistanceRequest(report, participant, comment, created, transactio
         null,
         optimisticReceipt,
         transactionID,
+        category,
     );
     API.write(
         'CreateDistanceRequest',
@@ -544,6 +576,7 @@ function createDistanceRequest(report, participant, comment, created, transactio
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             waypoints: JSON.stringify(TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true)),
             created,
+            category,
         },
         onyxData,
     );
@@ -564,10 +597,14 @@ function createDistanceRequest(report, participant, comment, created, transactio
  * @param {Object} participant
  * @param {String} comment
  * @param {Object} [receipt]
+ * @param {String} [category]
  */
-function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined) {
+function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined, category = undefined) {
+    // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
+    const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
+    const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const {payerEmail, iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
-        report,
+        currentChatReport,
         participant,
         comment,
         amount,
@@ -577,6 +614,8 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
         payeeAccountID,
         payeeEmail,
         receipt,
+        undefined,
+        category,
     );
 
     API.write(
@@ -596,11 +635,12 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
             createdIOUReportActionID,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             receipt,
+            category,
         },
         onyxData,
     );
     resetMoneyRequestInfo();
-    Navigation.dismissModal(chatReport.reportID);
+    Navigation.dismissModal(isMoneyRequestReport ? report.reportID : chatReport.reportID);
     Report.notifyNewAction(chatReport.reportID, payeeAccountID);
 }
 
@@ -855,8 +895,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
                   [accountID]: {
                       accountID,
                       avatar: UserUtils.getDefaultAvatarURL(accountID),
-                      displayName: participant.displayName || participant.login,
-                      login: email,
+                      displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || email),
+                      login: participant.login,
                   },
               }
             : undefined;
@@ -878,6 +918,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOneIOUAction,
             oneOnOnePersonalDetailListAction,
             oneOnOneReportPreviewAction,
+            [],
             isNewOneOnOneChatReport,
             shouldCreateNewOneOnOneIOUReport,
         );
@@ -993,12 +1034,50 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
     const transactionThread = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`];
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread.parentReportID}`];
+    const chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`];
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
 
     // STEP 2: Build new modified expense report action.
     const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport);
     const updatedTransaction = TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport);
+
     // STEP 3: Compute the IOU total and update the report preview message so LHN amount owed is correct
+    // Should only update if the transaction matches the currency of the report, else we wait for the update
+    // from the server with the currency conversion
+    let updatedMoneyRequestReport = {...iouReport};
+    const updatedChatReport = {...chatReport};
+    if (updatedTransaction.currency === iouReport.currency && updatedTransaction.modifiedAmount) {
+        const diff = TransactionUtils.getAmount(transaction, true) - TransactionUtils.getAmount(updatedTransaction, true);
+        if (ReportUtils.isExpenseReport(iouReport)) {
+            updatedMoneyRequestReport.total += diff;
+        } else {
+            updatedMoneyRequestReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, updatedReportAction.actorAccountID, diff, TransactionUtils.getCurrency(transaction), false);
+        }
+
+        updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedTransaction.currency);
+
+        // Update the last message of the IOU report
+        const lastMessage = ReportUtils.getIOUReportActionMessage(
+            iouReport.reportID,
+            CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+            updatedMoneyRequestReport.total,
+            '',
+            updatedTransaction.currency,
+            '',
+            false,
+        );
+        updatedMoneyRequestReport.lastMessageText = lastMessage[0].text;
+        updatedMoneyRequestReport.lastMessageHtml = lastMessage[0].html;
+
+        // Update the last message of the chat report
+        const messageText = Localize.translateLocal('iou.payerOwesAmount', {
+            payer: updatedMoneyRequestReport.managerEmail,
+            amount: CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedMoneyRequestReport.currency),
+        });
+        updatedChatReport.lastMessageText = messageText;
+        updatedChatReport.lastMessageHtml = messageText;
+    }
+
     // STEP 4: Compose the optimistic data
     const optimisticData = [
         {
@@ -1013,6 +1092,16 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: updatedTransaction,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+            value: updatedMoneyRequestReport,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`,
+            value: updatedChatReport,
+        },
     ];
 
     const successData = [
@@ -1036,6 +1125,11 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+            value: {pendingAction: null},
+        },
     ];
 
     const failureData = [
@@ -1053,13 +1147,18 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.report}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: iouReport,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`,
+            value: chatReport,
+        },
     ];
 
     // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment, merchant} = ReportUtils.getTransactionDetails(updatedTransaction);
+    const {created, amount, currency, comment, merchant, category} = ReportUtils.getTransactionDetails(updatedTransaction);
     API.write(
         'EditMoneyRequest',
         {
@@ -1070,6 +1169,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             currency,
             comment,
             merchant,
+            category,
         },
         {optimisticData, successData, failureData},
     );
@@ -1835,6 +1935,17 @@ function setMoneyRequestMerchant(merchant) {
     Onyx.merge(ONYXKEYS.IOU, {merchant: merchant.trim()});
 }
 
+/**
+ * @param {String} category
+ */
+function setMoneyRequestCategory(category) {
+    Onyx.merge(ONYXKEYS.IOU, {category});
+}
+
+function resetMoneyRequestCategory() {
+    Onyx.merge(ONYXKEYS.IOU, {category: ''});
+}
+
 /**
  * @param {Object[]} participants
  */
@@ -1876,12 +1987,14 @@ function navigateToNextPage(iou, iouType, reportID, report) {
 
     // If a request is initiated on a report, skip the participants selection step and navigate to the confirmation page.
     if (report.reportID) {
+        // If the report is iou or expense report, we should get the chat report to set participant for request money
+        const chatReport = ReportUtils.isMoneyRequestReport(report) ? ReportUtils.getReport(report.chatReportID) : report;
         // Reinitialize the participants when the money request ID in Onyx does not match the ID from params
         if (_.isEmpty(iou.participants) || shouldReset) {
             const currentUserAccountID = currentUserPersonalDetails.accountID;
-            const participants = ReportUtils.isPolicyExpenseChat(report)
-                ? [{reportID: report.reportID, isPolicyExpenseChat: true, selected: true}]
-                : _.chain(report.participantAccountIDs)
+            const participants = ReportUtils.isPolicyExpenseChat(chatReport)
+                ? [{reportID: chatReport.reportID, isPolicyExpenseChat: true, selected: true}]
+                : _.chain(chatReport.participantAccountIDs)
                       .filter((accountID) => currentUserAccountID !== accountID)
                       .map((accountID) => ({accountID, selected: true}))
                       .value();
@@ -1913,6 +2026,8 @@ export {
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
     setMoneyRequestMerchant,
+    setMoneyRequestCategory,
+    resetMoneyRequestCategory,
     setMoneyRequestParticipants,
     setMoneyRequestReceipt,
     createEmptyTransaction,
diff --git a/src/libs/actions/Modal.js b/src/libs/actions/Modal.ts
similarity index 74%
rename from src/libs/actions/Modal.js
rename to src/libs/actions/Modal.ts
index ea3bfc351593..ff09731f59a7 100644
--- a/src/libs/actions/Modal.js
+++ b/src/libs/actions/Modal.ts
@@ -1,25 +1,20 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-let closeModal;
-let onModalClose;
+let closeModal: (isNavigating: boolean) => void;
+let onModalClose: null | (() => void);
 
 /**
  * Allows other parts of the app to call modal close function
- *
- * @param {Function} [onClose]
  */
-function setCloseModal(onClose) {
+function setCloseModal(onClose: () => void) {
     closeModal = onClose;
 }
 
 /**
  * Close modal in other parts of the app
- *
- * @param {Function} [onModalCloseCallback]
- * @param {Boolean} isNavigating
  */
-function close(onModalCloseCallback, isNavigating = true) {
+function close(onModalCloseCallback: () => void, isNavigating = true) {
     if (!closeModal) {
         // If modal is already closed, no need to wait for modal close. So immediately call callback.
         if (onModalCloseCallback) {
@@ -42,20 +37,16 @@ function onModalDidClose() {
 
 /**
  * Allows other parts of the app to know when a modal has been opened or closed
- *
- * @param {Boolean} isVisible
  */
-function setModalVisibility(isVisible) {
+function setModalVisibility(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {isVisible});
 }
 
 /**
  * Allows other parts of app to know that an alert modal is about to open.
  * This will trigger as soon as a modal is opened but not yet visible while animation is running.
- *
- * @param {Boolean} isVisible
  */
-function willAlertModalBecomeVisible(isVisible) {
+function willAlertModalBecomeVisible(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible});
 }
 
diff --git a/src/libs/actions/Network.js b/src/libs/actions/Network.ts
similarity index 58%
rename from src/libs/actions/Network.js
rename to src/libs/actions/Network.ts
index 892ba92f6973..212e44f6782d 100644
--- a/src/libs/actions/Network.js
+++ b/src/libs/actions/Network.ts
@@ -1,26 +1,18 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Boolean} isOffline
- */
-function setIsOffline(isOffline) {
+function setIsOffline(isOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {isOffline});
 }
 
-/**
- *
- * @param {Boolean} shouldForceOffline
- */
-function setShouldForceOffline(shouldForceOffline) {
+function setShouldForceOffline(shouldForceOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldForceOffline});
 }
 
 /**
  * Test tool that will fail all network requests when enabled
- * @param {Boolean} shouldFailAllRequests
  */
-function setShouldFailAllRequests(shouldFailAllRequests) {
+function setShouldFailAllRequests(shouldFailAllRequests: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldFailAllRequests});
 }
 
diff --git a/src/libs/actions/OnyxUpdates.js b/src/libs/actions/OnyxUpdates.ts
similarity index 62%
rename from src/libs/actions/OnyxUpdates.js
rename to src/libs/actions/OnyxUpdates.ts
index 8e45e7dd2e66..50a4fdffc3ae 100644
--- a/src/libs/actions/OnyxUpdates.js
+++ b/src/libs/actions/OnyxUpdates.ts
@@ -1,28 +1,25 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
+import Onyx, {OnyxEntry} from 'react-native-onyx';
+import {Merge} from 'type-fest';
 import PusherUtils from '../PusherUtils';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as QueuedOnyxUpdates from './QueuedOnyxUpdates';
 import CONST from '../../CONST';
+import {OnyxUpdatesFromServer, OnyxUpdateEvent, Request} from '../../types/onyx';
+import Response from '../../types/onyx/Response';
 
 // This key needs to be separate from ONYXKEYS.ONYX_UPDATES_FROM_SERVER so that it can be updated without triggering the callback when the server IDs are updated. If that
 // callback were triggered it would lead to duplicate processing of server updates.
-let lastUpdateIDAppliedToClient = 0;
+let lastUpdateIDAppliedToClient: OnyxEntry<number> = 0;
 Onyx.connect({
     key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
     callback: (val) => (lastUpdateIDAppliedToClient = val),
 });
 
-/**
- * @param {Object} request
- * @param {Object} response
- * @returns {Promise}
- */
-function applyHTTPSOnyxUpdates(request, response) {
+function applyHTTPSOnyxUpdates(request: Request, response: Response) {
     console.debug('[OnyxUpdateManager] Applying https update');
     // For most requests we can immediately update Onyx. For write requests we queue the updates and apply them after the sequential queue has flushed to prevent a replay effect in
     // the UI. See https://github.com/Expensify/App/issues/12775 for more info.
-    const updateHandler = request.data.apiRequestType === CONST.API_REQUEST_TYPE.WRITE ? QueuedOnyxUpdates.queueOnyxUpdates : Onyx.update;
+    const updateHandler = request?.data?.apiRequestType === CONST.API_REQUEST_TYPE.WRITE ? QueuedOnyxUpdates.queueOnyxUpdates : Onyx.update;
 
     // First apply any onyx data updates that are being sent back from the API. We wait for this to complete and then
     // apply successData or failureData. This ensures that we do not update any pending, loading, or other UI states contained
@@ -46,55 +43,45 @@ function applyHTTPSOnyxUpdates(request, response) {
         });
 }
 
-/**
- * @param {Array} updates
- * @returns {Promise}
- */
-function applyPusherOnyxUpdates(updates) {
+function applyPusherOnyxUpdates(updates: OnyxUpdateEvent[]) {
     console.debug('[OnyxUpdateManager] Applying pusher update');
-    const pusherEventPromises = _.map(updates, (update) => PusherUtils.triggerMultiEventHandler(update.eventType, update.data));
+    const pusherEventPromises = updates.map((update) => PusherUtils.triggerMultiEventHandler(update.eventType, update.data));
     return Promise.all(pusherEventPromises).then(() => {
         console.debug('[OnyxUpdateManager] Done applying Pusher update');
     });
 }
 
 /**
- * @param {Object[]} updateParams
- * @param {String} updateParams.type
- * @param {Number} updateParams.lastUpdateID
- * @param {Object} [updateParams.request] Exists if updateParams.type === 'https'
- * @param {Object} [updateParams.response] Exists if updateParams.type === 'https'
- * @param {Object} [updateParams.updates] Exists if updateParams.type === 'pusher'
- * @returns {Promise}
+ * @param [updateParams.request] Exists if updateParams.type === 'https'
+ * @param [updateParams.response] Exists if updateParams.type === 'https'
+ * @param [updateParams.updates] Exists if updateParams.type === 'pusher'
  */
-function apply({lastUpdateID, type, request, response, updates}) {
+function apply({lastUpdateID, type, request, response, updates}: Merge<OnyxUpdatesFromServer, {updates: OnyxUpdateEvent[]; type: 'pusher'}>): Promise<void>;
+function apply({lastUpdateID, type, request, response, updates}: Merge<OnyxUpdatesFromServer, {request: Request; response: Response; type: 'https'}>): Promise<Response>;
+function apply({lastUpdateID, type, request, response, updates}: OnyxUpdatesFromServer): Promise<void | Response> | undefined {
     console.debug(`[OnyxUpdateManager] Applying update type: ${type} with lastUpdateID: ${lastUpdateID}`, {request, response, updates});
 
-    if (lastUpdateID && lastUpdateID < lastUpdateIDAppliedToClient) {
+    if (lastUpdateID && lastUpdateIDAppliedToClient && Number(lastUpdateID) < lastUpdateIDAppliedToClient) {
         console.debug('[OnyxUpdateManager] Update received was older than current state, returning without applying the updates');
         return Promise.resolve();
     }
-    if (lastUpdateID && lastUpdateID > lastUpdateIDAppliedToClient) {
-        Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, lastUpdateID);
+    if (lastUpdateID && lastUpdateIDAppliedToClient && Number(lastUpdateID) > lastUpdateIDAppliedToClient) {
+        Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, Number(lastUpdateID));
     }
-    if (type === CONST.ONYX_UPDATE_TYPES.HTTPS) {
+    if (type === CONST.ONYX_UPDATE_TYPES.HTTPS && request && response) {
         return applyHTTPSOnyxUpdates(request, response);
     }
-    if (type === CONST.ONYX_UPDATE_TYPES.PUSHER) {
+    if (type === CONST.ONYX_UPDATE_TYPES.PUSHER && updates) {
         return applyPusherOnyxUpdates(updates);
     }
 }
 
 /**
- * @param {Object[]} updateParams
- * @param {String} updateParams.type
- * @param {Object} [updateParams.request] Exists if updateParams.type === 'https'
- * @param {Object} [updateParams.response] Exists if updateParams.type === 'https'
- * @param {Object} [updateParams.updates] Exists if updateParams.type === 'pusher'
- * @param {Number} [updateParams.lastUpdateID]
- * @param {Number} [updateParams.previousUpdateID]
+ * @param [updateParams.request] Exists if updateParams.type === 'https'
+ * @param [updateParams.response] Exists if updateParams.type === 'https'
+ * @param [updateParams.updates] Exists if updateParams.type === 'pusher'
  */
-function saveUpdateInformation(updateParams) {
+function saveUpdateInformation(updateParams: OnyxUpdatesFromServer) {
     // Always use set() here so that the updateParams are never merged and always unique to the request that came in
     Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, updateParams);
 }
@@ -102,10 +89,9 @@ function saveUpdateInformation(updateParams) {
 /**
  * This function will receive the previousUpdateID from any request/pusher update that has it, compare to our current app state
  * and return if an update is needed
- * @param {Number} previousUpdateID The previousUpdateID contained in the response object
- * @returns {Boolean}
+ * @param previousUpdateID The previousUpdateID contained in the response object
  */
-function doesClientNeedToBeUpdated(previousUpdateID = 0) {
+function doesClientNeedToBeUpdated(previousUpdateID = 0): boolean {
     // If no previousUpdateID is sent, this is not a WRITE request so we don't need to update our current state
     if (!previousUpdateID) {
         return false;
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 69a6bc475029..2d599053ea51 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -187,6 +187,8 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
         value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}},
     });
 
+    clearOutTaskInfo();
+
     API.write(
         'CreateTask',
         {
diff --git a/src/libs/addEncryptedAuthTokenToURL.js b/src/libs/addEncryptedAuthTokenToURL.ts
similarity index 58%
rename from src/libs/addEncryptedAuthTokenToURL.js
rename to src/libs/addEncryptedAuthTokenToURL.ts
index 827454fa2aa3..9bdb83c284ce 100644
--- a/src/libs/addEncryptedAuthTokenToURL.js
+++ b/src/libs/addEncryptedAuthTokenToURL.ts
@@ -1,19 +1,15 @@
-import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 
 let encryptedAuthToken = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (session) => (encryptedAuthToken = lodashGet(session, 'encryptedAuthToken', '')),
+    callback: (session) => (encryptedAuthToken = session?.encryptedAuthToken ?? ''),
 });
 
 /**
  * Add encryptedAuthToken to this attachment URL
- *
- * @param {String} url
- * @returns {String}
  */
-export default function (url) {
+export default function (url: string) {
     return `${url}?encryptedAuthToken=${encodeURIComponent(encryptedAuthToken)}`;
 }
diff --git a/src/libs/asyncOpenURL/index.js b/src/libs/asyncOpenURL/index.ts
similarity index 60%
rename from src/libs/asyncOpenURL/index.js
rename to src/libs/asyncOpenURL/index.ts
index e69777c5483c..5307049ee923 100644
--- a/src/libs/asyncOpenURL/index.js
+++ b/src/libs/asyncOpenURL/index.ts
@@ -1,6 +1,7 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
-export default function asyncOpenURL(promise, url) {
+const asyncOpenURL: AsyncOpenURL = (promise, url) => {
     if (!url) {
         return;
     }
@@ -8,4 +9,6 @@ export default function asyncOpenURL(promise, url) {
     promise.then((params) => {
         Linking.openURL(typeof url === 'string' ? url : url(params));
     });
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/index.website.js b/src/libs/asyncOpenURL/index.website.ts
similarity index 61%
rename from src/libs/asyncOpenURL/index.website.js
rename to src/libs/asyncOpenURL/index.website.ts
index e1c491450c18..d503644c1392 100644
--- a/src/libs/asyncOpenURL/index.website.js
+++ b/src/libs/asyncOpenURL/index.website.ts
@@ -1,13 +1,11 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
 /**
  * Prevents Safari from blocking pop-up window when opened within async call.
- *
- * @param {Promise} promise
- * @param {string}  url
- * @param {Boolean} shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
+ * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
  */
-export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic) {
+const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) => {
     if (!url) {
         return;
     }
@@ -22,8 +20,13 @@ export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic)
         const windowRef = window.open();
         promise
             .then((params) => {
+                if (!windowRef) {
+                    return;
+                }
                 windowRef.location = typeof url === 'string' ? url : url(params);
             })
-            .catch(() => windowRef.close());
+            .catch(() => windowRef?.close());
     }
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/types.ts b/src/libs/asyncOpenURL/types.ts
new file mode 100644
index 000000000000..bf24756b0cc2
--- /dev/null
+++ b/src/libs/asyncOpenURL/types.ts
@@ -0,0 +1,3 @@
+type AsyncOpenURL = <T>(promise: Promise<T>, url: string | ((params: T) => string), shouldSkipCustomSafariLogic?: boolean) => void;
+
+export default AsyncOpenURL;
diff --git a/src/libs/focusTextInputAfterAnimation/index.native.js b/src/libs/focusTextInputAfterAnimation/index.native.ts
similarity index 61%
rename from src/libs/focusTextInputAfterAnimation/index.native.js
rename to src/libs/focusTextInputAfterAnimation/index.native.ts
index 8cd44d111642..2ccbfe7368b2 100644
--- a/src/libs/focusTextInputAfterAnimation/index.native.js
+++ b/src/libs/focusTextInputAfterAnimation/index.native.ts
@@ -1,14 +1,15 @@
+import FocusTextInputAfterAnimation from './types';
+
 /**
  * Focus the text input with a slight delay to make sure modals are closed first.
  * Since in react-native-modal `onModalHide` is called before the modal is actually hidden.
  * It results in the keyboard being dismissed right away on both iOS and Android.
  * See this discussion for more details: https://github.com/Expensify/App/issues/18300
  *
- * @param {Object} inputRef
- * @param {Number} animationLength you must use your best guess as to what a good animationLength is. It can't be too short, or the animation won't be finished. It can't be too long or
+ * @param animationLength you must use your best guess as to what a good animationLength is. It can't be too short, or the animation won't be finished. It can't be too long or
  *      the user will notice that it feels sluggish
  */
-const focusTextInputAfterAnimation = (inputRef, animationLength = 0) => {
+const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef, animationLength = 0) => {
     setTimeout(() => {
         inputRef.focus();
     }, animationLength);
diff --git a/src/libs/focusTextInputAfterAnimation/index.js b/src/libs/focusTextInputAfterAnimation/index.ts
similarity index 61%
rename from src/libs/focusTextInputAfterAnimation/index.js
rename to src/libs/focusTextInputAfterAnimation/index.ts
index dba6e0fdcddc..1e3211372b41 100644
--- a/src/libs/focusTextInputAfterAnimation/index.js
+++ b/src/libs/focusTextInputAfterAnimation/index.ts
@@ -1,9 +1,9 @@
+import FocusTextInputAfterAnimation from './types';
+
 /**
  * This library is a no-op for all platforms except for Android and iOS and will immediately focus the given input without any delays.
- *
- * @param {Object} inputRef
  */
-const focusTextInputAfterAnimation = (inputRef) => {
+const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef) => {
     inputRef.focus();
 };
 
diff --git a/src/libs/focusTextInputAfterAnimation/types.ts b/src/libs/focusTextInputAfterAnimation/types.ts
new file mode 100644
index 000000000000..905ac7db4b7a
--- /dev/null
+++ b/src/libs/focusTextInputAfterAnimation/types.ts
@@ -0,0 +1,5 @@
+import {TextInput} from 'react-native';
+
+type FocusTextInputAfterAnimation = (inputRef: TextInput | HTMLInputElement, animationLength: number) => void;
+
+export default FocusTextInputAfterAnimation;
diff --git a/src/libs/isReportMessageAttachment.ts b/src/libs/isReportMessageAttachment.ts
index 3f9e9d2de201..c257e1db4191 100644
--- a/src/libs/isReportMessageAttachment.ts
+++ b/src/libs/isReportMessageAttachment.ts
@@ -13,14 +13,14 @@ type IsReportMessageAttachmentParams = {
  * @param reportActionMessage report action's message as text, html and translationKey
  */
 export default function isReportMessageAttachment({text, html, translationKey}: IsReportMessageAttachmentParams): boolean {
-    if (translationKey) {
-        return translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
-    }
-
     if (!text || !html) {
         return false;
     }
 
+    if (translationKey && text === CONST.ATTACHMENT_MESSAGE_TEXT) {
+        return translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
+    }
+
     const regex = new RegExp(` ${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="(.*)"`, 'i');
     return text === CONST.ATTACHMENT_MESSAGE_TEXT && (!!html.match(regex) || html === CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML);
 }
diff --git a/src/libs/searchCountryOptions.js b/src/libs/searchCountryOptions.js
deleted file mode 100644
index 9b0357a17a65..000000000000
--- a/src/libs/searchCountryOptions.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import _ from 'lodash';
-import StringUtils from './StringUtils';
-
-/**
- * Searches the countries/states data and returns sorted results based on the search query
- * @param {String} searchValue
- * @param {Object[]} countriesData - An array of country data objects
- * @returns {Object[]} An array of countries/states sorted based on the search query
- */
-function searchCountryOptions(searchValue, countriesData) {
-    if (_.isEmpty(searchValue)) {
-        return countriesData;
-    }
-
-    const trimmedSearchValue = StringUtils.sanitizeString(searchValue);
-    if (_.isEmpty(trimmedSearchValue)) {
-        return [];
-    }
-
-    const filteredData = _.filter(countriesData, (country) => _.includes(country.searchValue, trimmedSearchValue));
-
-    // sort by country code
-    return _.sortBy(filteredData, (country) => (_.toLower(country.value) === trimmedSearchValue ? -1 : 1));
-}
-
-export default searchCountryOptions;
diff --git a/src/libs/searchCountryOptions.ts b/src/libs/searchCountryOptions.ts
new file mode 100644
index 000000000000..8fb1cc9c37f3
--- /dev/null
+++ b/src/libs/searchCountryOptions.ts
@@ -0,0 +1,39 @@
+import StringUtils from './StringUtils';
+
+type CountryData = {
+    value: string;
+    keyForList: string;
+    text: string;
+    isSelected: boolean;
+    searchValue: string;
+};
+
+/**
+ * Searches the countries/states data and returns sorted results based on the search query
+ * @param countriesData - An array of country data objects
+ * @returns An array of countries/states sorted based on the search query
+ */
+function searchCountryOptions(searchValue: string, countriesData: CountryData[]): CountryData[] {
+    if (!searchValue) {
+        return countriesData;
+    }
+
+    const trimmedSearchValue = StringUtils.sanitizeString(searchValue);
+    if (!trimmedSearchValue) {
+        return [];
+    }
+
+    const filteredData = countriesData.filter((country) => country.searchValue.includes(trimmedSearchValue));
+
+    return filteredData.sort((a, b) => {
+        if (a.value.toLowerCase() === trimmedSearchValue) {
+            return -1;
+        }
+        if (b.value.toLowerCase() === trimmedSearchValue) {
+            return 1;
+        }
+        return 0;
+    });
+}
+
+export default searchCountryOptions;
diff --git a/src/libs/tryResolveUrlFromApiRoot.js b/src/libs/tryResolveUrlFromApiRoot.ts
similarity index 85%
rename from src/libs/tryResolveUrlFromApiRoot.js
rename to src/libs/tryResolveUrlFromApiRoot.ts
index cc46f034e45b..f9aef09a00a7 100644
--- a/src/libs/tryResolveUrlFromApiRoot.js
+++ b/src/libs/tryResolveUrlFromApiRoot.ts
@@ -15,11 +15,10 @@ const ORIGIN_PATTERN = new RegExp(`^(${ORIGINS_TO_REPLACE.join('|')})`);
  * - Similarly for prod or staging URLs we replace the `https://www.expensify`
  * or `https://staging.expensify` part, with `https://{API_ROOT}`
  * - Unmatched URLs (non expensify) are returned with no modifications
- *
- * @param {String} url
- * @returns {String}
  */
-export default function tryResolveUrlFromApiRoot(url) {
+function tryResolveUrlFromApiRoot(url: string): string;
+function tryResolveUrlFromApiRoot(url: number): number;
+function tryResolveUrlFromApiRoot(url: string | number): string | number {
     // in native, when we import an image asset, it will have a number representation which can be used in `source` of Image
     // in this case we can skip the url resolving
     if (typeof url === 'number') {
@@ -28,3 +27,5 @@ export default function tryResolveUrlFromApiRoot(url) {
     const apiRoot = ApiUtils.getApiRoot({shouldUseSecure: false});
     return url.replace(ORIGIN_PATTERN, apiRoot);
 }
+
+export default tryResolveUrlFromApiRoot;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.js b/src/libs/willBlurTextInputOnTapOutside/index.js
deleted file mode 100644
index 3c72b2d38a29..000000000000
--- a/src/libs/willBlurTextInputOnTapOutside/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => true;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.native.js b/src/libs/willBlurTextInputOnTapOutside/index.native.js
deleted file mode 100644
index eae5767cffbc..000000000000
--- a/src/libs/willBlurTextInputOnTapOutside/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => false;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.native.ts b/src/libs/willBlurTextInputOnTapOutside/index.native.ts
new file mode 100644
index 000000000000..1cf1bbafe7e6
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/index.native.ts
@@ -0,0 +1,5 @@
+import WillBlurTextInputOnTapOutside from './types';
+
+const willBlurTextInputOnTapOutside: WillBlurTextInputOnTapOutside = () => false;
+
+export default willBlurTextInputOnTapOutside;
diff --git a/src/libs/willBlurTextInputOnTapOutside/index.ts b/src/libs/willBlurTextInputOnTapOutside/index.ts
new file mode 100644
index 000000000000..7c88957821b3
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/index.ts
@@ -0,0 +1,5 @@
+import WillBlurTextInputOnTapOutside from './types';
+
+const willBlurTextInputOnTapOutside: WillBlurTextInputOnTapOutside = () => true;
+
+export default willBlurTextInputOnTapOutside;
diff --git a/src/libs/willBlurTextInputOnTapOutside/types.ts b/src/libs/willBlurTextInputOnTapOutside/types.ts
new file mode 100644
index 000000000000..1ef88eb98f8c
--- /dev/null
+++ b/src/libs/willBlurTextInputOnTapOutside/types.ts
@@ -0,0 +1,3 @@
+type WillBlurTextInputOnTapOutside = () => boolean;
+
+export default WillBlurTextInputOnTapOutside;
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 266515e29c2c..0094d174df21 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -89,7 +89,9 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
         if (canEdit) {
             return;
         }
-        Navigation.dismissModal();
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal();
+        });
     }, [canEdit]);
 
     // Update the transaction object and close the modal
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.js b/src/pages/LogInWithShortLivedAuthTokenPage.js
index 1679d3aa8b5d..62eff262611d 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.js
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.js
@@ -8,7 +8,7 @@ import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import Navigation from '../libs/Navigation/Navigation';
 import styles from '../styles/styles';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Icon from '../components/Icon';
 import * as Expensicons from '../components/Icon/Expensicons';
 import * as Illustrations from '../components/Icon/Illustrations';
@@ -93,7 +93,7 @@ function LogInWithShortLivedAuthTokenPage(props) {
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index b5ef85e14cbb..22cac40cf29c 100755
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -141,7 +141,7 @@ function ProfilePage(props) {
     const navigateBackTo = lodashGet(props.route, 'params.backTo', '');
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper shouldEnableAutoFocus>
             <HeaderWithBackButton
                 title={props.translate('common.profile')}
                 onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
index 1168a3ed271d..80c9257d367a 100644
--- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
@@ -103,6 +103,7 @@ function BankAccountPlaidStep(props) {
                     }}
                     plaidData={plaidData}
                     onExitPlaid={() => BankAccounts.setBankAccountSubStep(null)}
+                    onBlurPlaid={() => BankAccounts.setBankAccountSubStep(null)}
                     receivedRedirectURI={receivedRedirectURI}
                     plaidLinkOAuthToken={plaidLinkOAuthToken}
                     allowDebit
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index 8e718e193efe..74482ef612ed 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -11,7 +11,7 @@ import * as Expensicons from '../../components/Icon/Expensicons';
 import styles from '../../styles/styles';
 import TextLink from '../../components/TextLink';
 import Icon from '../../components/Icon';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import CONST from '../../CONST';
 import withLocalize from '../../components/withLocalize';
 import Text from '../../components/Text';
@@ -146,7 +146,7 @@ function BankAccountStep(props) {
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.m4]}>
                             <Icon
                                 src={Expensicons.Exclamation}
-                                fill={colors.red}
+                                fill={themeColors.danger}
                             />
                             <Text style={[styles.mutedTextLabel, styles.ml4, styles.flex1]}>{props.translate('bankAccount.validateAccountError')}</Text>
                         </View>
@@ -164,7 +164,7 @@ function BankAccountStep(props) {
                             <View style={[styles.ml1]}>
                                 <Icon
                                     src={Expensicons.Lock}
-                                    fill={colors.blue}
+                                    fill={themeColors.link}
                                 />
                             </View>
                         </PressableWithoutFeedback>
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index d76d10c9e52c..22133415cea8 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -224,7 +224,7 @@ function CompanyStep({reimbursementAccount, reimbursementAccountDraft, getDefaul
                     <Picker
                         inputID="incorporationType"
                         label={translate('companyStep.companyType')}
-                        items={_.map(translate('companyStep.incorporationTypes'), (label, value) => ({value, label}))}
+                        items={_.map(_.keys(CONST.INCORPORATION_TYPES), (key) => ({value: key, label: translate(`companyStep.incorporationTypes.${key}`)}))}
                         placeholder={{value: '', label: '-'}}
                         defaultValue={getDefaultStateForField('incorporationType')}
                         shouldSaveDraft
diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 6505b604b614..dd42ed80c3d4 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React, {Component} from 'react';
+import React, {useCallback, useEffect, useState, useMemo} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
@@ -9,17 +9,15 @@ import * as ReportUtils from '../libs/ReportUtils';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
 import Navigation from '../libs/Navigation/Navigation';
-import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
 import * as Report from '../libs/actions/Report';
 import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import ScreenWrapper from '../components/ScreenWrapper';
 import Timing from '../libs/actions/Timing';
 import CONST from '../CONST';
-import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
-import compose from '../libs/compose';
 import personalDetailsPropType from './personalDetailsPropType';
 import reportPropTypes from './reportPropTypes';
 import Performance from '../libs/Performance';
+import useLocalize from '../hooks/useLocalize';
 
 const propTypes = {
     /* Onyx Props */
@@ -32,11 +30,6 @@ const propTypes = {
 
     /** All reports shared with the user */
     reports: PropTypes.objectOf(reportPropTypes),
-
-    /** Window Dimensions Props */
-    ...windowDimensionsPropTypes,
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
@@ -45,171 +38,157 @@ const defaultProps = {
     reports: {},
 };
 
-class SearchPage extends Component {
-    constructor(props) {
-        super(props);
+function SearchPage({betas, personalDetails, reports}) {
+    // Data for initialization (runs only on the first render)
+    const {
+        recentReports: initialRecentReports,
+        personalDetails: initialPersonalDetails,
+        userToInvite: initialUserToInvite,
+        // Ignoring the rule because in this case we need the data only initially
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    } = useMemo(() => OptionsListUtils.getSearchOptions(reports, personalDetails, '', betas), []);
+
+    const [searchValue, setSearchValue] = useState('');
+    const [searchOptions, setSearchOptions] = useState({
+        recentReports: initialRecentReports,
+        personalDetails: initialPersonalDetails,
+        userToInvite: initialUserToInvite,
+    });
+
+    const {translate} = useLocalize();
+
+    const updateOptions = useCallback(() => {
+        const {
+            recentReports: localRecentReports,
+            personalDetails: localPersonalDetails,
+            userToInvite: localUserToInvite,
+        } = OptionsListUtils.getSearchOptions(reports, personalDetails, searchValue.trim(), betas);
+
+        setSearchOptions({
+            recentReports: localRecentReports,
+            personalDetails: localPersonalDetails,
+            userToInvite: localUserToInvite,
+        });
+    }, [reports, personalDetails, searchValue, betas]);
+
+    const debouncedUpdateOptions = useMemo(() => _.debounce(updateOptions, 75), [updateOptions]);
 
+    useEffect(() => {
         Timing.start(CONST.TIMING.SEARCH_RENDER);
         Performance.markStart(CONST.TIMING.SEARCH_RENDER);
+    }, []);
 
-        this.searchRendered = this.searchRendered.bind(this);
-        this.selectReport = this.selectReport.bind(this);
-        this.onChangeText = this.onChangeText.bind(this);
-        this.debouncedUpdateOptions = _.debounce(this.updateOptions.bind(this), 75);
-
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getSearchOptions(props.reports, props.personalDetails, '', props.betas);
-
-        this.state = {
-            searchValue: '',
-            recentReports,
-            personalDetails,
-            userToInvite,
-        };
-    }
-
-    componentDidUpdate(prevProps) {
-        if (_.isEqual(prevProps.reports, this.props.reports) && _.isEqual(prevProps.personalDetails, this.props.personalDetails)) {
-            return;
-        }
-        this.updateOptions();
-    }
-
-    onChangeText(searchValue = '') {
-        this.setState({searchValue}, this.debouncedUpdateOptions);
-    }
+    useEffect(() => {
+        debouncedUpdateOptions();
+    }, [searchValue, debouncedUpdateOptions]);
 
     /**
      * Returns the sections needed for the OptionsSelector
      *
      * @returns {Array}
      */
-    getSections() {
+    const getSections = () => {
         const sections = [];
         let indexOffset = 0;
 
-        if (this.state.recentReports.length > 0) {
+        if (searchOptions.recentReports.length > 0) {
             sections.push({
-                data: this.state.recentReports,
+                data: searchOptions.recentReports,
                 shouldShow: true,
                 indexOffset,
             });
-            indexOffset += this.state.recentReports.length;
+            indexOffset += searchOptions.recentReports.length;
         }
 
-        if (this.state.personalDetails.length > 0) {
+        if (searchOptions.personalDetails.length > 0) {
             sections.push({
-                data: this.state.personalDetails,
+                data: searchOptions.personalDetails,
                 shouldShow: true,
                 indexOffset,
             });
-            indexOffset += this.state.recentReports.length;
+            indexOffset += searchOptions.recentReports.length;
         }
 
-        if (this.state.userToInvite) {
+        if (searchOptions.userToInvite) {
             sections.push({
-                data: [this.state.userToInvite],
+                data: [searchOptions.userToInvite],
                 shouldShow: true,
                 indexOffset,
             });
         }
 
         return sections;
-    }
+    };
 
-    searchRendered() {
+    const searchRendered = () => {
         Timing.end(CONST.TIMING.SEARCH_RENDER);
         Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
-    }
-
-    updateOptions() {
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getSearchOptions(
-            this.props.reports,
-            this.props.personalDetails,
-            this.state.searchValue.trim(),
-            this.props.betas,
-        );
-        this.setState({
-            userToInvite,
-            recentReports,
-            personalDetails,
-        });
-    }
+    };
+
+    const onChangeText = (value = '') => {
+        setSearchValue(value);
+    };
 
     /**
      * Reset the search value and redirect to the selected report
      *
      * @param {Object} option
      */
-    selectReport(option) {
+    const selectReport = (option) => {
         if (!option) {
             return;
         }
-
         if (option.reportID) {
-            this.setState(
-                {
-                    searchValue: '',
-                },
-                () => {
-                    Navigation.dismissModal(option.reportID);
-                },
-            );
+            setSearchValue('');
+            Navigation.dismissModal(option.reportID);
         } else {
             Report.navigateToAndOpenReport([option.login]);
         }
-    }
-
-    render() {
-        const sections = this.getSections();
-        const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails);
-        const headerMessage = OptionsListUtils.getHeaderMessage(
-            this.state.recentReports.length + this.state.personalDetails.length !== 0,
-            Boolean(this.state.userToInvite),
-            this.state.searchValue,
-        );
-
-        return (
-            <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-                {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                    <>
-                        <HeaderWithBackButton title={this.props.translate('common.search')} />
-                        <View style={[styles.flex1, styles.w100, styles.pRelative]}>
-                            <OptionsSelector
-                                sections={sections}
-                                value={this.state.searchValue}
-                                onSelectRow={this.selectReport}
-                                onChangeText={this.onChangeText}
-                                headerMessage={headerMessage}
-                                hideSectionHeaders
-                                showTitleTooltip
-                                shouldShowOptions={didScreenTransitionEnd && isOptionsDataReady}
-                                textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
-                                onLayout={this.searchRendered}
-                                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                            />
-                        </View>
-                    </>
-                )}
-            </ScreenWrapper>
-        );
-    }
+    };
+
+    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
+    const headerMessage = OptionsListUtils.getHeaderMessage(
+        searchOptions.recentReports.length + searchOptions.personalDetails.length !== 0,
+        Boolean(searchOptions.userToInvite),
+        searchValue,
+    );
+    return (
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
+                <>
+                    <HeaderWithBackButton title={translate('common.search')} />
+                    <View style={[styles.flex1, styles.w100, styles.pRelative]}>
+                        <OptionsSelector
+                            sections={getSections()}
+                            value={searchValue}
+                            onSelectRow={selectReport}
+                            onChangeText={onChangeText}
+                            headerMessage={headerMessage}
+                            hideSectionHeaders
+                            showTitleTooltip
+                            shouldShowOptions={didScreenTransitionEnd && isOptionsDataReady}
+                            textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                            onLayout={searchRendered}
+                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                        />
+                    </View>
+                </>
+            )}
+        </ScreenWrapper>
+    );
 }
 
 SearchPage.propTypes = propTypes;
 SearchPage.defaultProps = defaultProps;
-
-export default compose(
-    withLocalize,
-    withWindowDimensions,
-    withOnyx({
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
-    }),
-)(SearchPage);
+SearchPage.displayName = 'SearchPage';
+export default withOnyx({
+    reports: {
+        key: ONYXKEYS.COLLECTION.REPORT,
+    },
+    personalDetails: {
+        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    },
+    betas: {
+        key: ONYXKEYS.BETAS,
+    },
+})(SearchPage);
diff --git a/src/pages/TeachersUnite/ImTeacherPage.js b/src/pages/TeachersUnite/ImTeacherPage.js
index f077c7724978..dbeba700d208 100644
--- a/src/pages/TeachersUnite/ImTeacherPage.js
+++ b/src/pages/TeachersUnite/ImTeacherPage.js
@@ -22,7 +22,7 @@ function ImTeacherPage() {
         <ScreenWrapper>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iAmATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <BlockingView
                 shouldShowLink
diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
index c225d99f561c..fe25c54cb8cc 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
@@ -83,7 +83,7 @@ function IntroSchoolPrincipalPage(props) {
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.introSchoolPrincipal')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <Form
                 enabledWhenOffline
diff --git a/src/pages/TeachersUnite/KnowATeacherPage.js b/src/pages/TeachersUnite/KnowATeacherPage.js
index a77afea61745..795bc170a83c 100644
--- a/src/pages/TeachersUnite/KnowATeacherPage.js
+++ b/src/pages/TeachersUnite/KnowATeacherPage.js
@@ -94,7 +94,7 @@ function KnowATeacherPage(props) {
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iKnowATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
             />
             <Form
                 enabledWhenOffline
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 74994e4dc9d0..8d389a8c8581 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -20,7 +20,7 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import Text from '../../components/Text';
 import Tooltip from '../../components/Tooltip';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import reportPropTypes from '../reportPropTypes';
 import ONYXKEYS from '../../ONYXKEYS';
 import ThreeDotsMenu from '../../components/ThreeDotsMenu';
@@ -209,7 +209,7 @@ function HeaderView(props) {
                                 <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                     <Icon
                                         src={Expensicons.DotIndicator}
-                                        fill={colors.red}
+                                        fill={themeColors.danger}
                                     />
                                 </View>
                             )}
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 5d0cb5ab9bf6..004087c22308 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -247,9 +247,10 @@ function ReportScreen({
 
     useEffect(() => {
         const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+            const isTopMostReportID = Navigation.getTopmostReportId() === getReportID(route);
             // If the report is not fully visible (AKA on small screen devices and LHR is open) or the report is optimistic (AKA not yet created)
             // we don't need to call openReport
-            if (!getIsReportFullyVisible(isTopMostReportId) || report.isOptimisticReport) {
+            if (!getIsReportFullyVisible(isTopMostReportID) || report.isOptimisticReport) {
                 return;
             }
 
@@ -298,6 +299,7 @@ function ReportScreen({
             <ScreenWrapper
                 style={screenWrapperStyle}
                 shouldEnableKeyboardAvoidingView={isTopMostReportId}
+                shouldDisableFocusTrap
             >
                 <FullPageNotFoundView
                     shouldShow={(!report.reportID && !report.isLoadingReportActions && !isLoading) || shouldHideReport}
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index bac79e1863e5..c974b801dbd9 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -95,9 +95,9 @@ export default [
         successTextTranslateKey: 'common.download',
         successIcon: Expensicons.Download,
         shouldShow: (type, reportAction) => {
-            const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
-            return isAttachment && message.html !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
+            const messageHtml = lodashGet(reportAction, ['message', 0, 'html']);
+            return isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction);
         },
         onPress: (closePopover, {reportAction}) => {
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
@@ -175,9 +175,7 @@ export default [
         successTextTranslateKey: 'reportActionContextMenu.copied',
         successIcon: Expensicons.Checkmark,
         shouldShow: (type, reportAction) =>
-            type === CONTEXT_MENU_TYPES.REPORT_ACTION &&
-            !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))) &&
-            !ReportActionsUtils.isMessageDeleted(reportAction),
+            type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportActionsUtils.isReportActionAttachment(reportAction) && !ReportActionsUtils.isMessageDeleted(reportAction),
 
         // If return value is true, we switch the `text` and `icon` on
         // `ContextMenuItem` with `successText` and `successIcon` which will fallback to
@@ -189,7 +187,7 @@ export default [
             const originalMessage = _.get(reportAction, 'originalMessage', {});
             const messageHtml = isTaskAction ? lodashGet(originalMessage, 'html', '') : lodashGet(message, 'html', '');
 
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
             if (!isAttachment) {
                 const content = selection || messageHtml;
                 if (isReportPreviewAction) {
@@ -208,9 +206,8 @@ export default [
                         Clipboard.setHtml(content, plainText);
                     }
                 }
-            } else {
-                Clipboard.setString(messageHtml);
             }
+
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
             }
@@ -225,8 +222,7 @@ export default [
         successIcon: Expensicons.Checkmark,
         successTextTranslateKey: 'reportActionContextMenu.copied',
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget) => {
-            const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
 
             // Only hide the copylink menu item when context menu is opened over img element.
             const isAttachmentTarget = lodashGet(menuTarget, 'tagName') === 'IMG' && isAttachment;
diff --git a/src/pages/home/report/LinkPreviewer.js b/src/pages/home/report/LinkPreviewer.js
index 7c88e9d54126..4fcbb0dc0569 100644
--- a/src/pages/home/report/LinkPreviewer.js
+++ b/src/pages/home/report/LinkPreviewer.js
@@ -8,7 +8,7 @@ import TextLink from '../../../components/TextLink';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import styles from '../../../styles/styles';
 import variables from '../../../styles/variables';
-import colors from '../../../styles/colors';
+import themeColors from '../../../styles/themes/default';
 
 const IMAGE_TYPES = ['jpg', 'jpeg', 'png'];
 const MAX_IMAGE_HEIGHT = 180;
@@ -99,7 +99,7 @@ function LinkPreviewer(props) {
                         {!_.isEmpty(title) && (
                             <TextLink
                                 fontSize={variables.fontSizeNormal}
-                                style={[styles.mv2, StyleUtils.getTextColorStyle(colors.blueLinkPreview), styles.alignSelfStart]}
+                                style={[styles.mv2, StyleUtils.getTextColorStyle(themeColors.link), styles.alignSelfStart]}
                                 href={url}
                             >
                                 {title}
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
index 5864b9b05023..6dd3355f4a53 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js
@@ -76,6 +76,9 @@ const propTypes = {
     /** Called when the add action button is pressed */
     onAddActionPressed: PropTypes.func.isRequired,
 
+    /** Called when the menu item is selected */
+    onItemSelected: PropTypes.func.isRequired,
+
     /** A ref for the add action button */
     actionButtonRef: PropTypes.shape({
         // eslint-disable-next-line react/forbid-prop-types
@@ -111,6 +114,7 @@ function AttachmentPickerWithMenuItems({
     onCanceledAttachmentPicker,
     onMenuClosed,
     onAddActionPressed,
+    onItemSelected,
     actionButtonRef,
 }) {
     const {translate} = useLocalize();
@@ -257,6 +261,7 @@ function AttachmentPickerWithMenuItems({
                             onClose={onPopoverMenuClose}
                             onItemSelected={(item, index) => {
                                 setMenuVisibility(false);
+                                onItemSelected();
 
                                 // In order for the file picker to open dynamically, the click
                                 // function must be called from within a event handler that was initiated
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
index 6a29c5b6cfef..3b5b181d2fcb 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
@@ -111,8 +111,7 @@ function ComposerWithSuggestions({
     const maxComposerLines = isSmallScreenWidth ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES;
 
     const isEmptyChat = useMemo(() => _.size(reportActions) === 1, [reportActions]);
-    const parentAction = ReportActionsUtils.getParentReportAction(report);
-    const shouldAutoFocus = !modal.isVisible && (shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentAction))) && shouldShowComposeInput;
+    const shouldAutoFocus = !modal.isVisible && (shouldFocusInputOnScreenFocus || isEmptyChat) && shouldShowComposeInput;
 
     const valueRef = useRef(value);
     valueRef.current = value;
@@ -322,11 +321,11 @@ function ComposerWithSuggestions({
         suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
     }, [suggestionsRef]);
 
-    const setShouldBlockSuggestionCalc = useCallback(() => {
+    const setShouldBlockSuggestionCalcToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
             return false;
         }
-        return suggestionsRef.current.setShouldBlockSuggestionCalc(true);
+        return suggestionsRef.current.setShouldBlockSuggestionCalc(false);
     }, [suggestionsRef]);
 
     /**
@@ -473,7 +472,7 @@ function ComposerWithSuggestions({
                     maxLines={maxComposerLines}
                     onFocus={onFocus}
                     onBlur={onBlur}
-                    onClick={setShouldBlockSuggestionCalc}
+                    onClick={setShouldBlockSuggestionCalcToFalse}
                     onPasteFile={displayFileInModal}
                     shouldClear={textInputShouldClear}
                     onClear={() => setTextInputShouldClear(false)}
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
index 3ad92fa5c769..89ed9ded787e 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -75,7 +75,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    modal: {},
     report: {},
     blockedFromConcierge: {},
     personalDetails: {},
@@ -205,6 +204,10 @@ function ReportActionCompose({
         composerRef.current.blur();
     }, []);
 
+    const onItemSelected = useCallback(() => {
+        isKeyboardVisibleWhenShowingModalRef.current = false;
+    }, []);
+
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
             return;
@@ -271,6 +274,7 @@ function ReportActionCompose({
             suggestionsRef.current.setShouldBlockSuggestionCalc(true);
         }
         isNextModalWillOpenRef.current = true;
+        isKeyboardVisibleWhenShowingModalRef.current = true;
     }, []);
 
     const onBlur = useCallback((e) => {
@@ -358,6 +362,7 @@ function ReportActionCompose({
                                     onCanceledAttachmentPicker={restoreKeyboardState}
                                     onMenuClosed={restoreKeyboardState}
                                     onAddActionPressed={onAddActionPressed}
+                                    onItemSelected={onItemSelected}
                                     actionButtonRef={actionButtonRef}
                                 />
                                 <ComposerWithSuggestions
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 1972d7b22319..8b263e380ab6 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -67,6 +67,7 @@ import * as BankAccounts from '../../../libs/actions/BankAccounts';
 import usePrevious from '../../../hooks/usePrevious';
 import ReportScreenContext from '../ReportScreenContext';
 import Permissions from '../../../libs/Permissions';
+import ReportAttachmentsContext from './ReportAttachmentsContext';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -129,6 +130,7 @@ function ReportActionItem(props) {
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const {reactionListRef} = useContext(ReportScreenContext);
+    const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
     const textInputRef = useRef();
     const popoverAnchorRef = useRef();
     const downloadedPreviews = useRef([]);
@@ -136,6 +138,18 @@ function ReportActionItem(props) {
     const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action);
     const originalReport = props.report.reportID === originalReportID ? props.report : ReportUtils.getReport(originalReportID);
 
+    const updateHiddenState = useCallback(
+        (isHiddenValue) => {
+            setIsHidden(isHiddenValue);
+            const isAttachment = ReportUtils.isReportMessageAttachment(_.last(props.action.message));
+            if (!isAttachment) {
+                return;
+            }
+            updateHiddenAttachments(props.action.reportActionID, isHiddenValue);
+        },
+        [props.action.reportActionID, props.action.message, updateHiddenAttachments],
+    );
+
     useEffect(
         () => () => {
             // ReportActionContextMenu, EmojiPicker and PopoverReactionList are global components,
@@ -362,7 +376,7 @@ function ReportActionItem(props) {
                                 <Button
                                     small
                                     style={[styles.mt2, styles.alignSelfStart]}
-                                    onPress={() => setIsHidden(!isHidden)}
+                                    onPress={() => updateHiddenState(!isHidden)}
                                 >
                                     <Text
                                         style={styles.buttonSmallText}
@@ -588,7 +602,7 @@ function ReportActionItem(props) {
                                 needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(props.action)}
                             >
                                 {isWhisper && (
-                                    <View style={[styles.flexRow, styles.pl5, styles.pt2]}>
+                                    <View style={[styles.flexRow, styles.pl5, styles.pt2, styles.pr3]}>
                                         <View style={[styles.pl6, styles.mr3]}>
                                             <Icon
                                                 src={Expensicons.Eye}
@@ -604,7 +618,7 @@ function ReportActionItem(props) {
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled
                                             numberOfLines={1}
-                                            textStyles={[styles.chatItemMessageHeaderTimestamp]}
+                                            textStyles={[styles.chatItemMessageHeaderTimestamp, styles.flex1]}
                                             shouldUseFullTitle={isWhisperOnlyVisibleByUser}
                                         />
                                     </View>
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index e2c50b288fe5..fab54846ab14 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -40,6 +40,7 @@ import useReportScrollManager from '../../../hooks/useReportScrollManager';
 import * as EmojiPickerAction from '../../../libs/actions/EmojiPickerAction';
 import focusWithDelay from '../../../libs/focusWithDelay';
 import ONYXKEYS from '../../../ONYXKEYS';
+import * as Browser from '../../../libs/Browser';
 
 const propTypes = {
     /** All the data of the action */
@@ -88,13 +89,15 @@ const cancelButtonID = 'cancelButton';
 const emojiButtonID = 'emojiButton';
 const messageEditInput = 'messageEditInput';
 
+const isMobileSafari = Browser.isMobileSafari();
+
 function ReportActionItemMessageEdit(props) {
     const reportScrollManager = useReportScrollManager();
     const {translate} = useLocalize();
     const {isKeyboardShown} = useKeyboardState();
     const {isSmallScreenWidth} = useWindowDimensions();
 
-    const [draft, setDraft] = useState(() => {
+    const getInitialDraft = () => {
         if (props.draftMessage === props.action.message[0].html) {
             // We only convert the report action message to markdown if the draft message is unchanged.
             const parser = new ExpensiMark();
@@ -102,8 +105,19 @@ function ReportActionItemMessageEdit(props) {
         }
         // We need to decode saved draft message because it's escaped before saving.
         return Str.htmlDecode(props.draftMessage);
-    });
-    const [selection, setSelection] = useState({start: 0, end: 0});
+    };
+
+    const getInitialSelection = () => {
+        if (isMobileSafari) {
+            return {start: 0, end: 0};
+        }
+
+        const length = getInitialDraft().length;
+        return {start: length, end: length};
+    };
+
+    const [draft, setDraft] = useState(() => getInitialDraft());
+    const [selection, setSelection] = useState(getInitialSelection());
     const [isFocused, setIsFocused] = useState(false);
     const [hasExceededMaxCommentLength, setHasExceededMaxCommentLength] = useState(false);
 
@@ -120,13 +134,15 @@ function ReportActionItemMessageEdit(props) {
         // For mobile Safari, updating the selection prop on an unfocused input will cause it to automatically gain focus
         // and subsequent programmatic focus shifts (e.g., modal focus trap) to show the blue frame (:focus-visible style),
         // so we need to ensure that it is only updated after focus.
-        setDraft((prevDraft) => {
-            setSelection({
-                start: prevDraft.length,
-                end: prevDraft.length,
+        if (isMobileSafari) {
+            setDraft((prevDraft) => {
+                setSelection({
+                    start: prevDraft.length,
+                    end: prevDraft.length,
+                });
+                return prevDraft;
             });
-            return prevDraft;
-        });
+        }
 
         return () => {
             // Skip if this is not the focused message so the other edit composer stays focused.
diff --git a/src/pages/home/report/ReportAttachmentsContext.js b/src/pages/home/report/ReportAttachmentsContext.js
new file mode 100644
index 000000000000..a51df01313e5
--- /dev/null
+++ b/src/pages/home/report/ReportAttachmentsContext.js
@@ -0,0 +1,42 @@
+import React, {useEffect, useMemo, useRef} from 'react';
+import PropTypes from 'prop-types';
+import useCurrentReportID from '../../../hooks/useCurrentReportID';
+
+const ReportAttachmentsContext = React.createContext();
+
+const propTypes = {
+    /** Rendered child component */
+    children: PropTypes.node.isRequired,
+};
+
+function ReportAttachmentsProvider(props) {
+    const currentReportID = useCurrentReportID();
+    const hiddenAttachments = useRef({});
+
+    useEffect(() => {
+        // We only want to store the attachment visibility for the current report.
+        // If the current report ID changes, clear the ref.
+        hiddenAttachments.current = {};
+    }, [currentReportID]);
+
+    const contextValue = useMemo(
+        () => ({
+            isAttachmentHidden: (reportActionID) => hiddenAttachments.current[reportActionID],
+            updateHiddenAttachments: (reportActionID, value) => {
+                hiddenAttachments.current = {
+                    ...hiddenAttachments.current,
+                    [reportActionID]: value,
+                };
+            },
+        }),
+        [],
+    );
+
+    return <ReportAttachmentsContext.Provider value={contextValue}>{props.children}</ReportAttachmentsContext.Provider>;
+}
+
+ReportAttachmentsProvider.propTypes = propTypes;
+ReportAttachmentsProvider.displayName = 'ReportAttachmentsProvider';
+
+export default ReportAttachmentsContext;
+export {ReportAttachmentsProvider};
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index c91509e62aba..c38ac9e01ccb 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -157,7 +157,7 @@ class SidebarLinks extends React.PureComponent {
                     <Header
                         title={
                             <LogoComponent
-                                fill={defaultTheme.textLight}
+                                fill={defaultTheme.text}
                                 width={variables.lhnLogoWidth}
                                 height={variables.lhnLogoHeight}
                             />
diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js
index 3d54306b6248..16cc3f2da458 100644
--- a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js
+++ b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js
@@ -34,6 +34,7 @@ function BaseSidebarScreen(props) {
             includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             style={[styles.sidebar, Browser.isMobile() ? styles.userSelectNone : {}]}
+            shouldDisableFocusTrap
         >
             {({insets}) => (
                 <>
diff --git a/src/pages/iou/DistanceRequestPage.js b/src/pages/iou/DistanceRequestPage.js
index d6eae999e2dc..39b068975c77 100644
--- a/src/pages/iou/DistanceRequestPage.js
+++ b/src/pages/iou/DistanceRequestPage.js
@@ -57,6 +57,7 @@ function DistanceRequestPage({iou, report, route}) {
             iou={iou}
             iouType={iouType}
             report={report}
+            route={route}
             transactionID={iou.transactionID}
         />
     );
diff --git a/src/pages/iou/MoneyRequestTagPage.js b/src/pages/iou/MoneyRequestTagPage.js
new file mode 100644
index 000000000000..a1795d50df8a
--- /dev/null
+++ b/src/pages/iou/MoneyRequestTagPage.js
@@ -0,0 +1,105 @@
+import React from 'react';
+import _ from 'underscore';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import compose from '../../libs/compose';
+import ROUTES from '../../ROUTES';
+import Navigation from '../../libs/Navigation/Navigation';
+import useLocalize from '../../hooks/useLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import TagPicker from '../../components/TagPicker';
+import Text from '../../components/Text';
+import tagPropTypes from '../../components/tagPropTypes';
+import ONYXKEYS from '../../ONYXKEYS';
+import reportPropTypes from '../reportPropTypes';
+import styles from '../../styles/styles';
+
+const propTypes = {
+    /** Navigation route context info provided by react navigation */
+    route: PropTypes.shape({
+        /** Route specific parameters used on this screen via route :iouType/new/tag/:reportID? */
+        params: PropTypes.shape({
+            /** The type of IOU report, i.e. bill, request, send */
+            iouType: PropTypes.string,
+
+            /** The report ID of the IOU */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /* Onyx props */
+    /** The report currently being used */
+    report: reportPropTypes,
+
+    /** Collection of tags attached to a policy */
+    policyTags: PropTypes.objectOf(
+        PropTypes.shape({
+            name: PropTypes.string,
+            tags: PropTypes.objectOf(tagPropTypes),
+        }),
+    ),
+};
+
+const defaultProps = {
+    report: {},
+    policyTags: {},
+};
+
+function MoneyRequestTagPage({route, report, policyTags}) {
+    const {translate} = useLocalize();
+
+    const iouType = lodashGet(route, 'params.iouType', '');
+
+    // Fetches the first tag list of the policy
+    const tagListKey = _.first(_.keys(policyTags));
+    const tagList = lodashGet(policyTags, tagListKey, {});
+    const tagListName = lodashGet(tagList, 'name', '');
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, lodashGet(report, 'reportID', '')));
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={tagListName || translate('common.tag')}
+                onBackButtonPress={navigateBack}
+            />
+            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagListName} || translate('common.tag'))}</Text>
+            <TagPicker
+                policyID={report.policyID}
+                reportID={report.reportID}
+                tag={tagListKey}
+                iouType={iouType}
+            />
+        </ScreenWrapper>
+    );
+}
+
+MoneyRequestTagPage.displayName = 'MoneyRequestTagPage';
+MoneyRequestTagPage.propTypes = propTypes;
+MoneyRequestTagPage.defaultProps = defaultProps;
+
+export default compose(
+    withOnyx({
+        iou: {
+            key: ONYXKEYS.IOU,
+        },
+    }),
+    withOnyx({
+        report: {
+            // Fetch report ID from IOU participants if no report ID is set in route
+            key: ({route, iou}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '') || lodashGet(iou, 'participants.0.reportID', '')}`,
+        },
+    }),
+    withOnyx({
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        },
+    }),
+)(MoneyRequestTagPage);
diff --git a/src/pages/iou/ReceiptSelector/index.js b/src/pages/iou/ReceiptSelector/index.js
index 94246b1e6fd1..3f5672c3d33d 100644
--- a/src/pages/iou/ReceiptSelector/index.js
+++ b/src/pages/iou/ReceiptSelector/index.js
@@ -141,11 +141,11 @@ function ReceiptSelector(props) {
                 receiptImageTopPosition={receiptImageTopPosition}
             />
             <ConfirmModal
-                title={attachmentInvalidReasonTitle}
+                title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
                 onConfirm={Receipt.clearUploadReceiptError}
                 onCancel={Receipt.clearUploadReceiptError}
                 isVisible={isAttachmentInvalid}
-                prompt={attachmentInvalidReason}
+                prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
                 confirmText={translate('common.close')}
                 shouldShowCancelButton={false}
             />
diff --git a/src/pages/iou/propTypes/index.js b/src/pages/iou/propTypes/index.js
index c7559323ebc1..5ecd00d11876 100644
--- a/src/pages/iou/propTypes/index.js
+++ b/src/pages/iou/propTypes/index.js
@@ -18,6 +18,9 @@ const iouPropTypes = PropTypes.shape({
     /** The merchant name */
     merchant: PropTypes.string,
 
+    /** The tag */
+    tag: PropTypes.string,
+
     /** Date that the request was created */
     created: PropTypes.string,
 
@@ -34,6 +37,7 @@ const iouDefaultProps = {
     currency: CONST.CURRENCY.USD,
     comment: '',
     merchant: '',
+    tag: '',
     created: '',
     participants: [],
     receiptPath: '',
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 8db5140d1092..1c653271ea7d 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -134,9 +134,19 @@ function MoneyRequestConfirmPage(props) {
                 selectedParticipants[0],
                 trimmedComment,
                 receipt,
+                props.iou.category,
             );
         },
-        [props.report, props.iou.amount, props.iou.currency, props.iou.created, props.iou.merchant, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID],
+        [
+            props.report,
+            props.iou.amount,
+            props.iou.currency,
+            props.iou.created,
+            props.iou.merchant,
+            props.currentUserPersonalDetails.login,
+            props.currentUserPersonalDetails.accountID,
+            props.iou.category,
+        ],
     );
 
     /**
@@ -151,12 +161,13 @@ function MoneyRequestConfirmPage(props) {
                 trimmedComment,
                 props.iou.created,
                 props.iou.transactionID,
+                props.iou.category,
                 props.iou.amount,
                 props.iou.currency,
                 props.iou.merchant,
             );
         },
-        [props.report, props.iou.created, props.iou.transactionID, props.iou.amount, props.iou.currency, props.iou.merchant],
+        [props.report, props.iou.created, props.iou.transactionID, props.iou.category, props.iou.amount, props.iou.currency, props.iou.merchant],
     );
 
     const createTransaction = useCallback(
@@ -272,6 +283,8 @@ function MoneyRequestConfirmPage(props) {
                                 iouAmount={props.iou.amount}
                                 iouComment={props.iou.comment}
                                 iouCurrencyCode={props.iou.currency}
+                                iouCategory={props.iou.category}
+                                iouTag={props.iou.tag}
                                 onConfirm={createTransaction}
                                 onSendMoney={sendMoney}
                                 onSelectParticipant={(option) => {
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
index 968faa6e5f23..84ea24f4da6b 100644
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
@@ -10,14 +10,13 @@ import MoneyRequestParticipantsSplitSelector from './MoneyRequestParticipantsSpl
 import MoneyRequestParticipantsSelector from './MoneyRequestParticipantsSelector';
 import styles from '../../../../styles/styles';
 import ScreenWrapper from '../../../../components/ScreenWrapper';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
 import Navigation from '../../../../libs/Navigation/Navigation';
-import compose from '../../../../libs/compose';
 import * as DeviceCapabilities from '../../../../libs/DeviceCapabilities';
 import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
 import * as IOU from '../../../../libs/actions/IOU';
 import * as MoneyRequestUtils from '../../../../libs/MoneyRequestUtils';
 import {iouPropTypes, iouDefaultProps} from '../../propTypes';
+import useLocalize from '../../../../hooks/useLocalize';
 
 const propTypes = {
     /** React Navigation route */
@@ -37,8 +36,6 @@ const propTypes = {
 
     /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
     selectedTab: PropTypes.oneOf([CONST.TAB.DISTANCE, CONST.TAB.MANUAL, CONST.TAB.SCAN]).isRequired,
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
@@ -46,15 +43,32 @@ const defaultProps = {
 };
 
 function MoneyRequestParticipantsPage(props) {
+    const {translate} = useLocalize();
     const prevMoneyRequestId = useRef(props.iou.id);
     const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
     const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
+    const isNewReportIDSelectedLocally = useRef(false);
+    const optionsSelectorRef = useRef();
     const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, props.selectedTab);
 
-    const navigateToNextStep = () => {
+    const splitNavigateToNextStep = () => {
         Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
     };
 
+    const moneyRequestNavigateToNextStep = (option) => {
+        isNewReportIDSelectedLocally.current = true;
+
+        if (!option.reportID) {
+            IOU.setMoneyRequestId(iouType.current);
+            Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
+
+            return;
+        }
+
+        IOU.setMoneyRequestId(`${iouType.current}${option.reportID}`);
+        Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, option.reportID));
+    };
+
     const navigateBack = (forceFallback = false) => {
         Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), forceFallback);
     };
@@ -63,7 +77,7 @@ function MoneyRequestParticipantsPage(props) {
         // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
         if (prevMoneyRequestId.current !== props.iou.id) {
             // The ID is cleared on completing a request. In that case, we will do nothing
-            if (!isDistanceRequest && props.iou.id) {
+            if (!isNewReportIDSelectedLocally.current && !isDistanceRequest && props.iou.id) {
                 navigateBack(true);
             }
             return;
@@ -71,7 +85,7 @@ function MoneyRequestParticipantsPage(props) {
 
         // Reset the money request Onyx if the ID in Onyx does not match the ID from params
         const moneyRequestId = `${iouType.current}${reportID.current}`;
-        const shouldReset = props.iou.id !== moneyRequestId;
+        const shouldReset = props.iou.id !== moneyRequestId && !isNewReportIDSelectedLocally.current;
         if (shouldReset) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
@@ -88,23 +102,25 @@ function MoneyRequestParticipantsPage(props) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
+            onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={styles.flex1}>
                     <HeaderWithBackButton
-                        title={isDistanceRequest ? props.translate('common.distance') : props.translate('iou.cash')}
+                        title={isDistanceRequest ? translate('common.distance') : translate('iou.cash')}
                         onBackButtonPress={navigateBack}
                     />
                     {iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT ? (
                         <MoneyRequestParticipantsSplitSelector
-                            onStepComplete={navigateToNextStep}
+                            onStepComplete={splitNavigateToNextStep}
                             participants={props.iou.participants}
                             onAddParticipants={IOU.setMoneyRequestParticipants}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         />
                     ) : (
                         <MoneyRequestParticipantsSelector
-                            onStepComplete={navigateToNextStep}
+                            ref={(el) => (optionsSelectorRef.current = el)}
+                            onStepComplete={moneyRequestNavigateToNextStep}
                             onAddParticipants={IOU.setMoneyRequestParticipants}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                             iouType={iouType.current}
@@ -121,12 +137,11 @@ MoneyRequestParticipantsPage.displayName = 'IOUParticipantsPage';
 MoneyRequestParticipantsPage.propTypes = propTypes;
 MoneyRequestParticipantsPage.defaultProps = defaultProps;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        iou: {key: ONYXKEYS.IOU},
-        selectedTab: {
-            key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
-        },
-    }),
-)(MoneyRequestParticipantsPage);
+export default withOnyx({
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
+    selectedTab: {
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+    },
+})(MoneyRequestParticipantsPage);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
index ef1d6565f595..e12672650a54 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -11,11 +11,15 @@ import compose from '../../../../libs/compose';
 import CONST from '../../../../CONST';
 import personalDetailsPropType from '../../../personalDetailsPropType';
 import reportPropTypes from '../../../reportPropTypes';
+import refPropTypes from '../../../../components/refPropTypes';
 
 const propTypes = {
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
+    /** A ref to forward to options selector's text input */
+    forwardedRef: refPropTypes,
+
     /** Callback to inform parent modal of success */
     onStepComplete: PropTypes.func.isRequired,
 
@@ -41,6 +45,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    forwardedRef: undefined,
     safeAreaPaddingBottomStyle: {},
     personalDetails: {},
     reports: {},
@@ -148,7 +153,7 @@ class MoneyRequestParticipantsSelector extends Component {
      */
     addSingleParticipant(option) {
         this.props.onAddParticipants([{accountID: option.accountID, login: option.login, isPolicyExpenseChat: option.isPolicyExpenseChat, reportID: option.reportID, selected: true}]);
-        this.props.onStepComplete();
+        this.props.onStepComplete(option);
     }
 
     render() {
@@ -161,6 +166,8 @@ class MoneyRequestParticipantsSelector extends Component {
 
         return (
             <OptionsSelector
+                ref={this.props.forwardedRef}
+                autoFocus={false}
                 sections={this.getSections()}
                 value={this.state.searchTerm}
                 onSelectRow={this.addSingleParticipant}
@@ -191,4 +198,12 @@ export default compose(
             key: ONYXKEYS.BETAS,
         },
     }),
-)(MoneyRequestParticipantsSelector);
+)(
+    React.forwardRef((props, ref) => (
+        <MoneyRequestParticipantsSelector
+            /* eslint-disable-next-line react/jsx-props-no-spreading */
+            {...props}
+            forwardedRef={ref}
+        />
+    )),
+);
diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js
index 0d154809cd4d..0179c211ee55 100644
--- a/src/pages/iou/steps/NewRequestAmountPage.js
+++ b/src/pages/iou/steps/NewRequestAmountPage.js
@@ -182,7 +182,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
                     <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                         <HeaderWithBackButton
                             title={translate('iou.amount')}
-                            onBackButonBackButtonPress={navigateBack}
+                            onBackButtonPress={navigateBack}
                         />
                         {content}
                     </View>
diff --git a/src/pages/settings/Preferences/LanguagePage.js b/src/pages/settings/Preferences/LanguagePage.js
index 0eb93853726a..706fa3b62db6 100644
--- a/src/pages/settings/Preferences/LanguagePage.js
+++ b/src/pages/settings/Preferences/LanguagePage.js
@@ -7,6 +7,7 @@ import withLocalize, {withLocalizePropTypes} from '../../../components/withLocal
 import * as App from '../../../libs/actions/App';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
+import CONST from '../../../CONST';
 import SelectionList from '../../../components/SelectionList';
 
 const propTypes = {
@@ -17,11 +18,11 @@ const propTypes = {
 };
 
 function LanguagePage(props) {
-    const localesToLanguages = _.map(props.translate('languagePage.languages'), (language, key) => ({
-        value: key,
-        text: language.label,
-        keyForList: key,
-        isSelected: props.preferredLocale === key,
+    const localesToLanguages = _.map(CONST.LANGUAGES, (language) => ({
+        value: language,
+        text: props.translate(`languagePage.languages.${language}.label`),
+        keyForList: language,
+        isSelected: props.preferredLocale === language,
     }));
 
     return (
diff --git a/src/pages/settings/Preferences/PreferencesPage.js b/src/pages/settings/Preferences/PreferencesPage.js
index b8bb74295567..9e30e99ff38f 100755
--- a/src/pages/settings/Preferences/PreferencesPage.js
+++ b/src/pages/settings/Preferences/PreferencesPage.js
@@ -40,9 +40,6 @@ function PreferencesPage(props) {
     const {isProduction} = useEnvironment();
     const {translate, preferredLocale} = useLocalize();
 
-    const priorityModes = translate('priorityModePage.priorityModes');
-    const languages = translate('languagePage.languages');
-
     return (
         <IllustratedHeaderPageLayout
             title={translate('common.preferences')}
@@ -71,13 +68,13 @@ function PreferencesPage(props) {
                 </View>
                 <MenuItemWithTopDescription
                     shouldShowRightIcon
-                    title={priorityModes[props.priorityMode].label}
+                    title={translate(`priorityModePage.priorityModes.${props.priorityMode}.label`)}
                     description={translate('priorityModePage.priorityMode')}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_PRIORITY_MODE)}
                 />
                 <MenuItemWithTopDescription
                     shouldShowRightIcon
-                    title={languages[preferredLocale].label}
+                    title={translate(`languagePage.languages.${preferredLocale}.label`)}
                     description={translate('languagePage.language')}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_LANGUAGE)}
                 />
diff --git a/src/pages/settings/Preferences/PriorityModePage.js b/src/pages/settings/Preferences/PriorityModePage.js
index b32987e242de..0c3d28fe9d81 100644
--- a/src/pages/settings/Preferences/PriorityModePage.js
+++ b/src/pages/settings/Preferences/PriorityModePage.js
@@ -26,12 +26,12 @@ const defaultProps = {
 };
 
 function PriorityModePage(props) {
-    const priorityModes = _.map(props.translate('priorityModePage.priorityModes'), (mode, key) => ({
-        value: key,
-        text: mode.label,
-        alternateText: mode.description,
-        keyForList: key,
-        isSelected: props.priorityMode === key,
+    const priorityModes = _.map(_.values(CONST.PRIORITY_MODE), (mode) => ({
+        value: mode,
+        text: props.translate(`priorityModePage.priorityModes.${mode}.label`),
+        alternateText: props.translate(`priorityModePage.priorityModes.${mode}.description`),
+        keyForList: mode,
+        isSelected: props.priorityMode === mode,
     }));
 
     const updateMode = useCallback(
diff --git a/src/pages/settings/Preferences/ThemePage.js b/src/pages/settings/Preferences/ThemePage.js
index a260caa283e3..4e41d5fc7129 100644
--- a/src/pages/settings/Preferences/ThemePage.js
+++ b/src/pages/settings/Preferences/ThemePage.js
@@ -27,11 +27,11 @@ const defaultProps = {
 };
 
 function ThemePage(props) {
-    const localesToThemes = _.map(props.translate('themePage.themes'), (theme, key) => ({
-        value: key,
-        text: theme.label,
-        keyForList: key,
-        isSelected: (props.preferredTheme || CONST.THEME.DEFAULT) === key,
+    const localesToThemes = _.map(_.values(_.omit(CONST.THEME, 'DEFAULT')), (theme) => ({
+        value: theme,
+        text: props.translate(`themePage.themes.${theme}.label`),
+        keyForList: theme,
+        isSelected: (props.preferredTheme || CONST.THEME.DEFAULT) === theme,
     }));
 
     return (
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 973a0475846d..bcea33d9c366 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -76,6 +76,7 @@ function BaseValidateCodeForm(props) {
     const loginData = props.loginList[props.contactMethod];
     const inputValidateCodeRef = useRef();
     const validateLoginError = ErrorUtils.getEarliestErrorField(loginData, 'validateLogin');
+    const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
 
     useImperativeHandle(props.innerRef, () => ({
         focus() {
@@ -170,7 +171,7 @@ function BaseValidateCodeForm(props) {
             >
                 <View style={[styles.mt2, styles.dFlex, styles.flexColumn, styles.alignItemsStart]}>
                     <PressableWithFeedback
-                        disabled={props.network.isOffline}
+                        disabled={shouldDisableResendValidateCode}
                         style={[styles.mr1]}
                         onPress={resendValidateCode}
                         underlayColor={themeColors.componentBG}
@@ -179,7 +180,7 @@ function BaseValidateCodeForm(props) {
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         accessibilityLabel={props.translate('validateCodeForm.magicCodeNotReceived')}
                     >
-                        <Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>{props.translate('validateCodeForm.magicCodeNotReceived')}</Text>
+                        <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>{props.translate('validateCodeForm.magicCodeNotReceived')}</Text>
                     </PressableWithFeedback>
                     {props.hasMagicCodeBeenSent && (
                         <DotIndicatorMessage
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 0d7e1c09454d..f178b25fd0fb 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -68,7 +68,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
         <StaticHeaderPageLayout
             title={localize.translate('statusPage.status')}
             onBackButtonPress={navigateBackToSettingsPage}
-            backgroundColor={themeColors.midtone}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.SETTINGS_STATUS]}
             image={MobileBackgroundImage}
             footer={footerComponent}
         >
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index 1f89756353ff..b0cbe7c9cc32 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -57,7 +57,11 @@ function ProfilePage(props) {
         if (pronounsKey.startsWith(CONST.PRONOUNS.PREFIX)) {
             pronounsKey = pronounsKey.slice(CONST.PRONOUNS.PREFIX.length);
         }
-        return lodashGet(props.translate('pronouns'), pronounsKey, props.translate('profilePage.selectYourPronouns'));
+
+        if (!pronounsKey) {
+            return props.translate('profilePage.selectYourPronouns');
+        }
+        return props.translate(`pronouns.${pronounsKey}`);
     };
     const currentUserDetails = props.currentUserPersonalDetails || {};
     const contactMethodBrickRoadIndicator = UserUtils.getLoginListBrickRoadIndicator(props.loginList);
diff --git a/src/pages/settings/Profile/PronounsPage.js b/src/pages/settings/Profile/PronounsPage.js
index 5ce9957f568f..5f8824046d69 100644
--- a/src/pages/settings/Profile/PronounsPage.js
+++ b/src/pages/settings/Profile/PronounsPage.js
@@ -27,23 +27,23 @@ function PronounsPage({currentUserPersonalDetails}) {
     const currentPronounsKey = currentPronouns.substring(CONST.PRONOUNS.PREFIX.length);
 
     const [searchValue, setSearchValue] = useState(() => {
-        const currentPronounsText = _.chain(translate('pronouns'))
-            .find((_value, key) => key === currentPronounsKey)
+        const currentPronounsText = _.chain(CONST.PRONOUNS_LIST)
+            .find((_value) => _value === currentPronounsKey)
             .value();
 
-        return currentPronounsText || '';
+        return currentPronounsText ? translate(`pronouns.${currentPronounsText}`) : '';
     });
 
     const filteredPronounsList = useMemo(() => {
-        const pronouns = _.chain(translate('pronouns'))
-            .map((value, key) => {
-                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${key}`;
+        const pronouns = _.chain(CONST.PRONOUNS_LIST)
+            .map((value) => {
+                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${value}`;
                 const isCurrentPronouns = fullPronounKey === currentPronouns;
 
                 return {
-                    text: value,
+                    text: translate(`pronouns.${value}`),
                     value: fullPronounKey,
-                    keyForList: key,
+                    keyForList: value,
                     isSelected: isCurrentPronouns,
                 };
             })
@@ -61,7 +61,7 @@ function PronounsPage({currentUserPersonalDetails}) {
     const headerMessage = searchValue.trim() && filteredPronounsList.length === 0 ? translate('common.noResultsFound') : '';
 
     const updatePronouns = (selectedPronouns) => {
-        PersonalDetails.updatePronouns(selectedPronouns.keyForList === currentPronouns.keyForList ? '' : lodashGet(selectedPronouns, 'value', ''));
+        PersonalDetails.updatePronouns(selectedPronouns.keyForList === currentPronounsKey ? '' : lodashGet(selectedPronouns, 'value', ''));
     };
 
     return (
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js
index 7dfc9fb6f9de..94cb40a3f6f3 100644
--- a/src/pages/settings/Profile/TimezoneInitialPage.js
+++ b/src/pages/settings/Profile/TimezoneInitialPage.js
@@ -1,7 +1,6 @@
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
-import moment from 'moment-timezone';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
@@ -37,7 +36,7 @@ function TimezoneInitialPage(props) {
     const updateAutomaticTimezone = (isAutomatic) => {
         PersonalDetails.updateAutomaticTimezone({
             automatic: isAutomatic,
-            selected: isAutomatic ? moment.tz.guess() : timezone.selected,
+            selected: isAutomatic ? Intl.DateTimeFormat().resolvedOptions().timeZone : timezone.selected,
         });
     };
 
diff --git a/src/pages/settings/Profile/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js
index 58a45f729e17..228bae5cbb6b 100644
--- a/src/pages/settings/Profile/TimezoneSelectPage.js
+++ b/src/pages/settings/Profile/TimezoneSelectPage.js
@@ -84,6 +84,7 @@ function TimezoneSelectPage(props) {
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_TIMEZONE)}
             />
             <SelectionList
+                headerMessage={timezoneInputText.trim() && !timezoneOptions.length ? translate('common.noResultsFound') : ''}
                 textInputLabel={translate('timezonePage.timezone')}
                 textInputValue={timezoneInputText}
                 onChangeText={filterShownTimezones}
diff --git a/src/pages/settings/Report/NotificationPreferencePage.js b/src/pages/settings/Report/NotificationPreferencePage.js
index 9765cf1ae0b4..17bd77a235ce 100644
--- a/src/pages/settings/Report/NotificationPreferencePage.js
+++ b/src/pages/settings/Report/NotificationPreferencePage.js
@@ -11,6 +11,7 @@ import withReportOrNotFound from '../../home/report/withReportOrNotFound';
 import FullPageNotFoundView from '../../../components/BlockingViews/FullPageNotFoundView';
 import reportPropTypes from '../../reportPropTypes';
 import ROUTES from '../../../ROUTES';
+import CONST from '../../../CONST';
 import * as Report from '../../../libs/actions/Report';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -26,17 +27,20 @@ const greenCheckmark = {src: Expensicons.Checkmark, color: themeColors.success};
 
 function NotificationPreferencePage(props) {
     const shouldDisableNotificationPreferences = ReportUtils.shouldDisableSettings(props.report) || ReportUtils.isArchivedRoom(props.report);
-    const notificationPreferenceOptions = _.map(props.translate('notificationPreferencesPage.notificationPreferences'), (preference, key) => ({
-        value: key,
-        text: preference,
-        keyForList: key,
+    const notificationPreferenceOptions = _.map(
+        _.filter(_.values(CONST.REPORT.NOTIFICATION_PREFERENCE), (pref) => pref !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN),
+        (preference) => ({
+            value: preference,
+            text: props.translate(`notificationPreferencesPage.notificationPreferences.${preference}`),
+            keyForList: preference,
 
-        // Include the green checkmark icon to indicate the currently selected value
-        customIcon: key === props.report.notificationPreference ? greenCheckmark : null,
+            // Include the green checkmark icon to indicate the currently selected value
+            customIcon: preference === props.report.notificationPreference ? greenCheckmark : null,
 
-        // This property will make the currently selected value have bold text
-        boldStyle: key === props.report.notificationPreference,
-    }));
+            // This property will make the currently selected value have bold text
+            boldStyle: preference === props.report.notificationPreference,
+        }),
+    );
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index 41f0d222e80b..51cb287f9564 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -87,6 +87,7 @@ function BaseValidateCodeForm(props) {
 
     const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);
     const isLoadingResendValidationForm = props.account.loadingForm === CONST.FORMS.RESEND_VALIDATE_CODE_FORM;
+    const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
 
     useEffect(() => {
         if (!(inputValidateCodeRef.current && hasError && (props.session.autoAuthState === CONST.AUTO_AUTH_STATE.FAILED || props.account.isLoading))) {
@@ -279,13 +280,13 @@ function BaseValidateCodeForm(props) {
                                 style={[styles.mt2]}
                                 onPress={resendValidateCode}
                                 underlayColor={themeColors.componentBG}
-                                disabled={props.network.isOffline}
+                                disabled={shouldDisableResendValidateCode}
                                 hoverDimmingValue={1}
                                 pressDimmingValue={0.2}
                                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                                 accessibilityLabel={props.translate('validateCodeForm.magicCodeNotReceived')}
                             >
-                                <Text style={[StyleUtils.getDisabledLinkStyles(props.network.isOffline)]}>
+                                <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>
                                     {hasError ? props.translate('validateCodeForm.requestNewCodeAfterErrorOccurred') : props.translate('validateCodeForm.magicCodeNotReceived')}
                                 </Text>
                             </PressableWithFeedback>
diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index f8f076a1630c..99050e73bda0 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useMemo} from 'react';
+import React, {useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -63,11 +63,12 @@ const defaultProps = {
 };
 
 function NewTaskPage(props) {
-    const [assignee, setAssignee] = React.useState({});
-    const [shareDestination, setShareDestination] = React.useState({});
-    const [errorMessage, setErrorMessage] = React.useState('');
-    const [parentReport, setParentReport] = React.useState({});
-    const shouldClearOutTaskInfoOnUnmount = React.useRef(false);
+    const [assignee, setAssignee] = useState({});
+    const [shareDestination, setShareDestination] = useState({});
+    const [title, setTitle] = useState('');
+    const [description, setDescription] = useState('');
+    const [errorMessage, setErrorMessage] = useState('');
+    const [parentReport, setParentReport] = useState({});
 
     const isAllowedToCreateTask = useMemo(() => _.isEmpty(parentReport) || ReportUtils.isAllowedToComment(parentReport), [parentReport]);
 
@@ -95,17 +96,17 @@ function NewTaskPage(props) {
             const displayDetails = Task.getShareDestination(props.task.shareDestination, props.reports, props.personalDetails);
             setShareDestination(displayDetails);
         }
-    }, [props]);
 
-    useEffect(
-        () => () => {
-            if (!shouldClearOutTaskInfoOnUnmount.current) {
-                return;
-            }
-            Task.clearOutTaskInfo();
-        },
-        [],
-    );
+        // If we have a title, we want to set the title
+        if (!_.isUndefined(props.task.title)) {
+            setTitle(props.task.title);
+        }
+
+        // If we have a description, we want to set the description
+        if (!_.isUndefined(props.task.description)) {
+            setDescription(props.task.description);
+        }
+    }, [props]);
 
     // On submit, we want to call the createTask function and wait to validate
     // the response
@@ -125,7 +126,6 @@ function NewTaskPage(props) {
             return;
         }
 
-        shouldClearOutTaskInfoOnUnmount.current = true;
         Task.createTaskAndNavigate(parentReport.reportID, props.task.title, props.task.description, props.task.assignee, props.task.assigneeAccountID, props.task.assigneeChatReport);
     }
 
@@ -153,13 +153,13 @@ function NewTaskPage(props) {
                     <View style={styles.mb5}>
                         <MenuItemWithTopDescription
                             description={props.translate('task.title')}
-                            title={props.task.title || ''}
+                            title={title}
                             onPress={() => Navigation.navigate(ROUTES.NEW_TASK_TITLE)}
                             shouldShowRightIcon
                         />
                         <MenuItemWithTopDescription
                             description={props.translate('task.description')}
-                            title={props.task.description || ''}
+                            title={description}
                             onPress={() => Navigation.navigate(ROUTES.NEW_TASK_DESCRIPTION)}
                             shouldShowRightIcon
                             numberOfLinesTitle={2}
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.js b/src/pages/tasks/TaskAssigneeSelectorModal.js
index f8f567a7b913..349891dad58a 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.js
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.js
@@ -17,9 +17,11 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
 import compose from '../../libs/compose';
 import personalDetailsPropType from '../personalDetailsPropType';
 import reportPropTypes from '../reportPropTypes';
-import ROUTES from '../../ROUTES';
 import * as ReportUtils from '../../libs/ReportUtils';
+import ROUTES from '../../ROUTES';
 import * as Task from '../../libs/actions/Task';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
 
 const propTypes = {
     /** Beta features list */
@@ -190,14 +192,18 @@ function TaskAssigneeSelectorModal(props) {
             const assigneeChatReport = Task.setAssigneeValue(option.login, option.accountID, props.route.params.reportID, OptionsListUtils.isCurrentUser(option));
 
             // Pass through the selected assignee
-            Task.editTaskAssigneeAndNavigate(props.task.report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
+            Task.editTaskAssigneeAndNavigate(report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
         }
     };
 
+    const isOpen = ReportUtils.isOpenTaskReport(props.task.report);
+    const canModifyTask = Task.canModifyTask(props.task.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = report && ReportUtils.isTaskReport(props.task.report) && (!canModifyTask || !isOpen);
+
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                <>
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
                     <HeaderWithBackButton
                         title={props.translate('task.assignee')}
                         onBackButtonPress={() => (lodashGet(props.route.params, 'reportID') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}
@@ -215,7 +221,7 @@ function TaskAssigneeSelectorModal(props) {
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         />
                     </View>
-                </>
+                </FullPageNotFoundView>
             )}
         </ScreenWrapper>
     );
@@ -227,6 +233,7 @@ TaskAssigneeSelectorModal.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
index 0ccd3821571e..382e8d80d4ad 100644
--- a/src/pages/tasks/TaskDescriptionPage.js
+++ b/src/pages/tasks/TaskDescriptionPage.js
@@ -12,11 +12,14 @@ import reportPropTypes from '../reportPropTypes';
 import styles from '../../styles/styles';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
+import * as ReportUtils from '../../libs/ReportUtils';
 import CONST from '../../CONST';
 import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
 import * as Browser from '../../libs/Browser';
-import * as ReportUtils from '../../libs/ReportUtils';
 import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** Current user session */
@@ -55,37 +58,54 @@ function TaskDescriptionPage(props) {
     }
     const inputRef = useRef(null);
 
+    const isOpen = ReportUtils.isOpenTaskReport(props.report);
+    const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = ReportUtils.isTaskReport(props.report) && (!canModifyTask || !isOpen);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)}
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton title={props.translate('task.task')} />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
-                validate={validate}
-                onSubmit={submit}
-                submitButtonText={props.translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={[styles.mb4]}>
-                    <TextInput
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        inputID="description"
-                        name="description"
-                        label={props.translate('newTaskPage.descriptionOptional')}
-                        accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
-                        defaultValue={(props.report && props.report.description) || ''}
-                        ref={(el) => (inputRef.current = el)}
-                        autoGrowHeight
-                        submitOnEnter={!Browser.isMobile()}
-                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                        textAlignVertical="top"
-                    />
-                </View>
-            </Form>
+            {({didScreenTransitionEnd}) => (
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
+                    <HeaderWithBackButton title={props.translate('task.task')} />
+                    <Form
+                        style={[styles.flexGrow1, styles.ph5]}
+                        formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
+                        validate={validate}
+                        onSubmit={submit}
+                        submitButtonText={props.translate('common.save')}
+                        enabledWhenOffline
+                    >
+                        <View style={[styles.mb4]}>
+                            <TextInput
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                inputID="description"
+                                name="description"
+                                label={props.translate('newTaskPage.descriptionOptional')}
+                                accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
+                                defaultValue={(props.report && props.report.description) || ''}
+                                ref={(el) => {
+                                    // if we wrap the page with FullPageNotFoundView we need to explicitly handle focusing on text input
+                                    if (!el) {
+                                        return;
+                                    }
+                                    if (!inputRef.current && didScreenTransitionEnd) {
+                                        focusAndUpdateMultilineInputRange(el);
+                                    }
+                                    inputRef.current = el;
+                                }}
+                                autoGrowHeight
+                                submitOnEnter={!Browser.isMobile()}
+                                containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                textAlignVertical="top"
+                            />
+                        </View>
+                    </Form>
+                </FullPageNotFoundView>
+            )}
         </ScreenWrapper>
     );
 }
@@ -95,6 +115,8 @@ TaskDescriptionPage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js
index 9e3edd370264..9a7a36a1e119 100644
--- a/src/pages/tasks/TaskTitlePage.js
+++ b/src/pages/tasks/TaskTitlePage.js
@@ -13,9 +13,12 @@ import styles from '../../styles/styles';
 import reportPropTypes from '../reportPropTypes';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
-import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
+import CONST from '../../CONST';
 import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -67,6 +70,9 @@ function TaskTitlePage(props) {
     }
 
     const inputRef = useRef(null);
+    const isOpen = ReportUtils.isOpenTaskReport(props.report);
+    const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = ReportUtils.isTaskReport(props.report) && (!canModifyTask || !isOpen);
 
     return (
         <ScreenWrapper
@@ -74,27 +80,37 @@ function TaskTitlePage(props) {
             onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()}
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton title={props.translate('task.task')} />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
-                validate={validate}
-                onSubmit={submit}
-                submitButtonText={props.translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={[styles.mb4]}>
-                    <TextInput
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        inputID="title"
-                        name="title"
-                        label={props.translate('task.title')}
-                        accessibilityLabel={props.translate('task.title')}
-                        defaultValue={(props.report && props.report.reportName) || ''}
-                        ref={(el) => (inputRef.current = el)}
-                    />
-                </View>
-            </Form>
+            {({didScreenTransitionEnd}) => (
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
+                    <HeaderWithBackButton title={props.translate('task.task')} />
+                    <Form
+                        style={[styles.flexGrow1, styles.ph5]}
+                        formID={ONYXKEYS.FORMS.EDIT_TASK_FORM}
+                        validate={validate}
+                        onSubmit={submit}
+                        submitButtonText={props.translate('common.save')}
+                        enabledWhenOffline
+                    >
+                        <View style={[styles.mb4]}>
+                            <TextInput
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                inputID="title"
+                                name="title"
+                                label={props.translate('task.title')}
+                                accessibilityLabel={props.translate('task.title')}
+                                defaultValue={(props.report && props.report.reportName) || ''}
+                                ref={(el) => {
+                                    if (!el) return;
+                                    if (!inputRef.current && didScreenTransitionEnd) {
+                                        el.focus();
+                                    }
+                                    inputRef.current = el;
+                                }}
+                            />
+                        </View>
+                    </Form>
+                </FullPageNotFoundView>
+            )}
         </ScreenWrapper>
     );
 }
@@ -104,6 +120,8 @@ TaskTitlePage.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 0d6599631b8d..8f93434e6845 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -104,7 +104,7 @@ function WorkspaceInitialPage(props) {
     const goToRoom = useCallback(
         (type) => {
             const room = _.find(props.reports, (report) => report && report.policyID === policy.id && report.chatType === type && !ReportUtils.isThread(report));
-            Navigation.navigate(ROUTES.getReportRoute(room.reportID));
+            Navigation.dismissModal(room.reportID);
         },
         [props.reports, policy],
     );
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index 53ddd0fb5d96..5110bed598f1 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -307,6 +307,7 @@ function WorkspaceMembersPage(props) {
 
             result.push({
                 keyForList: accountID,
+                accountID: Number(accountID),
                 isSelected: _.contains(selectedEmployees, Number(accountID)),
                 isDisabled: accountID === props.session.accountID || details.login === props.policy.owner || policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 text: props.formatPhoneNumber(details.displayName),
diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts
index 8945bc0be058..ec06bb07c3fe 100644
--- a/src/styles/StyleUtils.ts
+++ b/src/styles/StyleUtils.ts
@@ -13,7 +13,6 @@ import spacing from './utilities/spacing';
 import * as UserUtils from '../libs/UserUtils';
 import * as Browser from '../libs/Browser';
 import cursor from './utilities/cursor';
-import * as NumberUtils from '../libs/NumberUtils';
 
 type ColorValue = ValueOf<typeof colors>;
 type AvatarSizeName = ValueOf<typeof CONST.AVATAR_SIZE>;
@@ -259,9 +258,12 @@ function getSafeAreaMargins(insets?: EdgeInsets): ViewStyle | CSSProperties {
 
 function getZoomCursorStyle(isZoomed: boolean, isDragging: boolean): ViewStyle | CSSProperties {
     if (!isZoomed) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return styles.cursorZoomIn;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return isDragging ? styles.cursorGrabbing : styles.cursorZoomOut;
 }
 
@@ -336,12 +338,16 @@ function getWidthStyle(width: number): ViewStyle | CSSProperties {
  */
 function getAutoGrowHeightInputStyle(textInputHeight: number, maxHeight: number): ViewStyle | CSSProperties {
     if (textInputHeight > maxHeight) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return {
             ...styles.pr0,
             ...styles.overflowAuto,
         };
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...styles.pr0,
         ...styles.overflowHidden,
@@ -439,11 +445,17 @@ function getBackgroundColorWithOpacityStyle(backgroundColor: string, opacity: nu
 function getBadgeColorStyle(success: boolean, error: boolean, isPressed = false, isAdHoc = false): ViewStyle | CSSProperties {
     if (success) {
         if (isAdHoc) {
+            // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return isPressed ? styles.badgeAdHocSuccessPressed : styles.badgeAdHocSuccess;
         }
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return isPressed ? styles.badgeSuccessPressed : styles.badgeSuccess;
     }
     if (error) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return isPressed ? styles.badgeDangerPressed : styles.badgeDanger;
     }
     return {};
@@ -559,47 +571,19 @@ function getEmojiPickerStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProper
     };
 }
 
-/**
- * Get the random promo color and image for Login page
- */
-function getLoginPagePromoStyle(): ViewStyle | CSSProperties {
-    const promos = [
-        {
-            backgroundColor: colors.green,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_green.svg`,
-        },
-        {
-            backgroundColor: colors.orange,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_orange.svg`,
-        },
-        {
-            backgroundColor: colors.pink,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_pink.svg`,
-        },
-        {
-            backgroundColor: colors.blue,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_blue.svg`,
-        },
-        {
-            backgroundColor: colors.ivory,
-            backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/cpa-card.svg`,
-            redirectUri: `${CONST.USE_EXPENSIFY_URL}/accountants`,
-        },
-    ];
-    return promos[NumberUtils.generateRandomInt(0, 4)];
-}
-
 /**
  * Generate the styles for the ReportActionItem wrapper view.
  */
 function getReportActionItemStyle(isHovered = false, isLoading = false): ViewStyle | CSSProperties {
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         display: 'flex',
         justifyContent: 'space-between',
         backgroundColor: isHovered
             ? themeColors.hoverComponentBG
             : // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
-              colors.transparent,
+              themeColors.transparent,
         opacity: isLoading ? 0.5 : 1,
         ...styles.cursorInitial,
     };
@@ -609,6 +593,8 @@ function getReportActionItemStyle(isHovered = false, isLoading = false): ViewSty
  * Generate the wrapper styles for the mini ReportActionContextMenu.
  */
 function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped: boolean): ViewStyle | CSSProperties {
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...(isReportActionItemGrouped ? positioning.tn8 : positioning.tn4),
         ...positioning.r4,
@@ -970,7 +956,7 @@ function getAutoCompleteSuggestionContainerStyle(itemsHeight: number, shouldIncl
  * Select the correct color for text.
  */
 function getColoredBackgroundStyle(isColored: boolean): ViewStyle | CSSProperties {
-    return {backgroundColor: isColored ? colors.blueLink : undefined};
+    return {backgroundColor: isColored ? themeColors.link : undefined};
 }
 
 function getEmojiReactionBubbleStyle(isHovered: boolean, hasUserReacted: boolean, isContextMenu = false): ViewStyle | CSSProperties {
@@ -1018,7 +1004,7 @@ function getEmojiReactionCounterTextStyle(hasUserReacted: boolean): TextStyle |
         return {color: themeColors.reactionActiveText};
     }
 
-    return {color: themeColors.textLight};
+    return {color: themeColors.text};
 }
 
 /**
@@ -1043,6 +1029,8 @@ function displayIfTrue(condition: boolean): ViewStyle | CSSProperties {
 
 function getGoogleListViewStyle(shouldDisplayBorder: boolean): ViewStyle | CSSProperties {
     if (shouldDisplayBorder) {
+        // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return {
             ...styles.borderTopRounded,
             ...styles.borderBottomRounded,
@@ -1150,6 +1138,8 @@ function getDisabledLinkStyles(isDisabled = false): ViewStyle | CSSProperties {
         ...cursor.cursorDisabled,
     };
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...styles.link,
         ...(isDisabled ? disabledLinkStyles : {}),
@@ -1251,7 +1241,6 @@ export {
     getModalPaddingStyles,
     getFontFamilyMonospace,
     getEmojiPickerStyle,
-    getLoginPagePromoStyle,
     getReportActionItemStyle,
     getMiniReportActionContextMenuWrapperStyle,
     getKeyboardShortcutsModalWidth,
diff --git a/src/styles/ThemeStylesProvider.tsx b/src/styles/ThemeStylesProvider.tsx
index d8a081572644..d0db784ca8ca 100644
--- a/src/styles/ThemeStylesProvider.tsx
+++ b/src/styles/ThemeStylesProvider.tsx
@@ -1,8 +1,11 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React, {useMemo} from 'react';
 import useTheme from './themes/useTheme';
-import StylesContext from './ThemeStylesContext';
-import defaultStyles from './styles';
+import ThemeStylesContext from './ThemeStylesContext';
+// TODO: Rename this to "styles" once the app is migrated to theme switching hooks and HOCs
+import {stylesGenerator as stylesUntyped} from './styles';
+
+const styles = stylesUntyped as (theme: Record<string, string>) => Record<string, unknown>;
 
 type ThemeStylesProviderProps = {
     children: React.ReactNode;
@@ -11,23 +14,9 @@ type ThemeStylesProviderProps = {
 function ThemeStylesProvider({children}: ThemeStylesProviderProps) {
     const theme = useTheme();
 
-    const appContentStyle = useMemo(
-        () => ({
-            ...defaultStyles.appContent,
-            backgroundColor: theme.appBG,
-        }),
-        [theme.appBG],
-    );
-
-    const styles = useMemo(
-        () => ({
-            ...defaultStyles,
-            appContent: appContentStyle,
-        }),
-        [appContentStyle],
-    );
+    const themeStyles = useMemo(() => styles(theme), [theme]);
 
-    return <StylesContext.Provider value={styles}>{children}</StylesContext.Provider>;
+    return <ThemeStylesContext.Provider value={themeStyles}>{children}</ThemeStylesContext.Provider>;
 }
 
 ThemeStylesProvider.displayName = 'ThemeStylesProvider';
diff --git a/src/styles/cardStyles/index.js b/src/styles/cardStyles/index.js
deleted file mode 100644
index d8af8a627ffe..000000000000
--- a/src/styles/cardStyles/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Get card style for cardStyleInterpolator
- * @param {Number} screenWidth
- * @returns {Object}
- */
-export default function getCardStyles(screenWidth) {
-    return {
-        position: 'fixed',
-        width: screenWidth,
-        height: '100%',
-    };
-}
diff --git a/src/styles/cardStyles/index.native.js b/src/styles/cardStyles/index.native.js
deleted file mode 100644
index fef33f500708..000000000000
--- a/src/styles/cardStyles/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function getCardStyles() {
-    return {};
-}
diff --git a/src/styles/cardStyles/index.native.ts b/src/styles/cardStyles/index.native.ts
new file mode 100644
index 000000000000..94b8758efd05
--- /dev/null
+++ b/src/styles/cardStyles/index.native.ts
@@ -0,0 +1,5 @@
+import GetCardStyles from './types';
+
+const getCardStyles: GetCardStyles = () => ({});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/index.ts b/src/styles/cardStyles/index.ts
new file mode 100644
index 000000000000..823081b62904
--- /dev/null
+++ b/src/styles/cardStyles/index.ts
@@ -0,0 +1,12 @@
+import GetCardStyles from './types';
+
+/**
+ * Get card style for cardStyleInterpolator
+ */
+const getCardStyles: GetCardStyles = (screenWidth) => ({
+    position: 'fixed',
+    width: screenWidth,
+    height: '100%',
+});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/types.ts b/src/styles/cardStyles/types.ts
new file mode 100644
index 000000000000..e1598b7696ff
--- /dev/null
+++ b/src/styles/cardStyles/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
+
+type GetCardStyles = (screenWidth: number) => Partial<Pick<CSSProperties | ViewStyle, 'position' | 'width' | 'height'>>;
+
+export default GetCardStyles;
diff --git a/src/styles/colors.js b/src/styles/colors.js
index 2c70cb4a8a78..9ac3226a1b80 100644
--- a/src/styles/colors.js
+++ b/src/styles/colors.js
@@ -2,44 +2,44 @@
  * DO NOT import colors.js into files. Use ../themes/default.js instead.
  */
 export default {
-    dark: '#0b1b34',
     black: '#000000',
-    blue: '#0185ff',
-    blueHover: '#B0D9FF',
+    white: '#FFFFFF',
     ivory: '#fffaf0',
-    orange: '#FF7101',
-    pink: '#F68DFE',
     green: '#03D47C',
     greenHover: '#00C271',
     greenPressed: '#35DD96',
-    greenDisabled: '80E9BD',
     red: '#F25730',
     redHover: '#DE4822',
     redPressed: '#F57959',
-    redDisabled: '#F8AA97',
-    yellow: '#FED607',
     transparent: 'transparent',
 
     // Dark Mode Theme Colors
-    greenAppBackground: '#061B09',
-    greenHighlightBackground: '#07271F',
-    greenBorders: '#1A3D32',
-    greenBordersLighter: '#2B5548',
-    greenIcons: '#8B9C8F',
-    greenSupportingText: '#AFBBB0',
-    white: '#E7ECE9',
-    blueLink: '#5AB0FF',
-    blueLinkHover: '#B0D9FF',
-    blueLinkPreview: '#2EAAE2',
-    greenDefaultButton: '#184E3D',
-    greenDefaultButtonHover: '#2C6755',
-    greenDefaultButtonPressed: '#467164',
-    greenDefaultButtonDisabled: '#8BA69E',
-    midnight: '#002140',
+    darkAppBackground: '#061B09',
+    darkHighlightBackground: '#07271F',
+    darkBorders: '#1A3D32',
+    darkIcons: '#8B9C8F',
+    darkSupportingText: '#AFBBB0',
+    darkPrimaryText: '#E7ECE9',
+    darkDefaultButton: '#184E3D',
+    darkDefaultButtonHover: '#2C6755',
+    darkDefaultButtonPressed: '#467164',
+
+    // Light Mode Theme Colors
+    lightAppBackground: '#FCFBF9',
+    lightHighlightBackground: '#F8F4F0',
+    lightBorders: '#EBE6DF',
+    lightBordersLighter: '#2B5548',
+    lightIcons: '#A2A9A3',
+    lightSupportingText: '#76847E',
+    lightPrimaryText: '#002E22',
+    lightDefaultButton: '#EEEBE7',
+    lightDefaultButtonHover: '#E3DFD9',
+    lightDefaultButtonPressed: '#D2CCC3',
 
     // Brand Colors from Figma
     blue100: '#B0D9FF',
     blue200: '#8DC8FF',
+    blue300: '#5AB0FF',
     blue400: '#0185FF',
     blue500: '#0676DE',
     blue600: '#0164BF',
@@ -48,41 +48,46 @@ export default {
 
     green100: '#B1F2D6',
     green200: '#8EECC4',
+    green300: '#5BE3AA',
     green400: '#03D47C',
+    green500: '#00B268',
     green600: '#008C59',
     green700: '#085239',
     green800: '#002E22',
 
+    yellow100: '#FFF2B2',
     yellow200: '#FFED8F',
+    yellow300: '#FEE45E',
     yellow400: '#FED607',
+    yellow500: '#E4BC07',
+    yellow600: '#D18000',
     yellow700: '#722B03',
     yellow800: '#401102',
 
+    tangerine100: '#FFD7B0',
     tangerine200: '#FFC68C',
+    tangerine300: '#FFA75A',
     tangerine400: '#FF7101',
+    tangerine500: '#F25730',
+    tangerine600: '#BF3013',
     tangerine700: '#780505',
     tangerine800: '#400000',
 
+    pink100: '#FCDCFF',
     pink200: '#FBCCFF',
+    pink300: '#F9B5FE',
     pink400: '#F68DFE',
+    pink500: '#E96DF2',
     pink600: '#CF4CD9',
     pink700: '#712A76',
     pink800: '#49225B',
 
+    ice100: '#DFFDFE',
     ice200: '#CCF7FF',
+    ice300: '#A5FBFF',
     ice400: '#50EEF6',
     ice500: '#4ED7DE',
+    ice600: '#4BA6A6',
     ice700: '#28736D',
     ice800: '#134038',
-
-    orange800: '#400000',
-
-    // DEPRECATED COLORS. Do not reference these colors. Will be deleted in color switch PR.
-    gray1: '#FAFAFA',
-    gray2: '#ECECEC',
-    gray3: '#C6C9CA',
-    gray4: '#7D8B8F',
-    oldRed: '#fc3826',
-    oldRedHover: '#e13826',
-    oldRedDisabled: '#fea29a',
 };
diff --git a/src/styles/getReportActionContextMenuStyles.ts b/src/styles/getReportActionContextMenuStyles.ts
index 17f0828ab80c..9c0e159eb5fe 100644
--- a/src/styles/getReportActionContextMenuStyles.ts
+++ b/src/styles/getReportActionContextMenuStyles.ts
@@ -35,6 +35,8 @@ function getReportActionContextMenuStyles(isMini: boolean, isSmallScreenWidth: b
         return miniWrapperStyle;
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return [
         ...bigWrapperStyle,
 
diff --git a/src/styles/getTooltipStyles.ts b/src/styles/getTooltipStyles.ts
index 3f9de9c78b97..97402467ab4c 100644
--- a/src/styles/getTooltipStyles.ts
+++ b/src/styles/getTooltipStyles.ts
@@ -2,7 +2,6 @@ import {CSSProperties} from 'react';
 import {TextStyle, View, ViewStyle} from 'react-native';
 import spacing from './utilities/spacing';
 import styles from './styles';
-import colors from './colors';
 import themeColors from './themes/default';
 import fontFamily from './fontFamily';
 import variables from './variables';
@@ -267,13 +266,13 @@ export default function getTooltipStyles(
         pointerStyle: {
             width: 0,
             height: 0,
-            backgroundColor: colors.transparent,
+            backgroundColor: themeColors.transparent,
             borderStyle: 'solid',
             borderLeftWidth: POINTER_WIDTH / 2,
             borderRightWidth: POINTER_WIDTH / 2,
             borderTopWidth: POINTER_HEIGHT,
-            borderLeftColor: colors.transparent,
-            borderRightColor: colors.transparent,
+            borderLeftColor: themeColors.transparent,
+            borderRightColor: themeColors.transparent,
             borderTopColor: themeColors.heading,
             ...pointerAdditionalStyle,
         },
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 1c1340600a51..0fba61f1e8d9 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1,9 +1,8 @@
 import {defaultStyles as defaultPickerStyles} from 'react-native-picker-select/src/styles';
-import {StyleSheet} from 'react-native';
 import lodashClamp from 'lodash/clamp';
 import fontFamily from './fontFamily';
 import addOutlineWidth from './addOutlineWidth';
-import themeColors from './themes/default';
+import defaultTheme from './themes/default';
 import fontWeightBold from './fontWeight/bold';
 import variables from './variables';
 import spacing from './utilities/spacing';
@@ -27,14 +26,13 @@ import * as Browser from '../libs/Browser';
 import cursor from './utilities/cursor';
 import userSelect from './utilities/userSelect';
 import textUnderline from './utilities/textUnderline';
-import Colors from './colors';
 
 // touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
 const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};
 
-const picker = {
-    backgroundColor: themeColors.transparent,
-    color: themeColors.text,
+const picker = (theme) => ({
+    backgroundColor: theme.transparent,
+    color: theme.text,
     fontFamily: fontFamily.EXP_NEUE,
     fontSize: variables.fontSizeNormal,
     lineHeight: variables.fontSizeNormalHeight,
@@ -45,27 +43,27 @@ const picker = {
     height: variables.inputHeight,
     borderWidth: 0,
     textAlign: 'left',
-};
+});
 
-const link = {
-    color: themeColors.link,
-    textDecorationColor: themeColors.link,
+const link = (theme) => ({
+    color: theme.link,
+    textDecorationColor: theme.link,
     fontFamily: fontFamily.EXP_NEUE,
-};
+});
 
-const baseCodeTagStyles = {
+const baseCodeTagStyles = (theme) => ({
     borderWidth: 1,
     borderRadius: 5,
-    borderColor: themeColors.border,
-    backgroundColor: themeColors.textBackground,
-};
+    borderColor: theme.border,
+    backgroundColor: theme.textBackground,
+});
 
 const headlineFont = {
     fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
     fontWeight: '500',
 };
 
-const webViewStyles = {
+const webViewStyles = (theme) => ({
     // As of react-native-render-html v6, don't declare distinct styles for
     // custom renderers, the API for custom renderers has changed. Declare the
     // styles in the below "tagStyles" instead. If you need to reuse those
@@ -87,7 +85,7 @@ const webViewStyles = {
             fontWeight: 'bold',
         },
 
-        a: link,
+        a: link(theme),
 
         ul: {
             maxWidth: '100%',
@@ -102,7 +100,7 @@ const webViewStyles = {
         },
 
         blockquote: {
-            borderLeftColor: themeColors.border,
+            borderLeftColor: theme.border,
             borderLeftWidth: 4,
             paddingLeft: 12,
             marginTop: 4,
@@ -113,7 +111,7 @@ const webViewStyles = {
         },
 
         pre: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             paddingTop: 12,
             paddingBottom: 12,
             paddingRight: 8,
@@ -124,7 +122,7 @@ const webViewStyles = {
         },
 
         code: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             ...codeStyles.codeTextStyle,
             paddingLeft: 5,
             paddingRight: 5,
@@ -133,7 +131,7 @@ const webViewStyles = {
         },
 
         img: {
-            borderColor: themeColors.border,
+            borderColor: theme.border,
             borderRadius: variables.componentBorderRadiusNormal,
             borderWidth: 1,
             ...touchCalloutNone,
@@ -150,15 +148,15 @@ const webViewStyles = {
     },
 
     baseFontStyle: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         flex: 1,
         lineHeight: variables.fontSizeNormalHeight,
     },
-};
+});
 
-const styles = {
+const styles = (theme) => ({
     // Add all of our utility and helper styles
     ...spacing,
     ...sizing,
@@ -171,8 +169,8 @@ const styles = {
     ...writingDirection,
     ...cursor,
     ...userSelect,
-    ...themeColors,
     ...textUnderline,
+    ...theme, // TODO: Should we do this?
 
     rateCol: {
         margin: 0,
@@ -181,10 +179,10 @@ const styles = {
     },
 
     autoCompleteSuggestionsContainer: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         borderRadius: 8,
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         justifyContent: 'center',
         boxShadow: variables.popoverMenuShadow,
         position: 'absolute',
@@ -228,7 +226,7 @@ const styles = {
     },
 
     mentionSuggestionsHandle: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     appIconBorderRadius: {
@@ -243,30 +241,30 @@ const styles = {
         flexBasis: '48%',
     },
 
-    webViewStyles,
+    webViewStyles: webViewStyles(theme),
 
-    link,
+    link: link(theme),
 
     linkMuted: {
-        color: themeColors.textSupporting,
-        textDecorationColor: themeColors.textSupporting,
+        color: theme.textSupporting,
+        textDecorationColor: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
     },
 
     linkMutedHovered: {
-        color: themeColors.textMutedReversed,
+        color: theme.textMutedReversed,
     },
 
     highlightBG: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
     },
 
     appBG: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     h1: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeh1,
         fontWeight: fontWeightBold,
@@ -306,13 +304,13 @@ const styles = {
     },
 
     textLabel: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
     },
 
     mutedTextLabel: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
     },
@@ -324,7 +322,7 @@ const styles = {
     },
 
     textMicroBold: {
-        color: themeColors.text,
+        color: theme.text,
         fontWeight: fontWeightBold,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeSmall,
@@ -332,14 +330,14 @@ const styles = {
     },
 
     textMicroSupporting: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightSmall,
     },
 
     textExtraSmallSupporting: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeExtraSmall,
     },
@@ -383,7 +381,7 @@ const styles = {
     textHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
     },
@@ -391,7 +389,7 @@ const styles = {
     textHeadlineH1: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeh1,
         lineHeight: variables.lineHeightSizeh1,
     },
@@ -401,11 +399,11 @@ const styles = {
     },
 
     textWhite: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     textBlue: {
-        color: themeColors.link,
+        color: theme.link,
     },
 
     textUppercase: {
@@ -417,19 +415,19 @@ const styles = {
     },
 
     colorReversed: {
-        color: themeColors.textReversed,
+        color: theme.textReversed,
     },
 
     colorMutedReversed: {
-        color: themeColors.textMutedReversed,
+        color: theme.textMutedReversed,
     },
 
     colorMuted: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     colorHeading: {
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     bgTransparent: {
@@ -437,7 +435,7 @@ const styles = {
     },
 
     bgDark: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
     },
 
     opacity0: {
@@ -449,7 +447,7 @@ const styles = {
     },
 
     textDanger: {
-        color: themeColors.danger,
+        color: theme.danger,
     },
 
     borderRadiusNormal: {
@@ -457,7 +455,7 @@ const styles = {
     },
 
     button: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
         borderRadius: variables.buttonBorderRadius,
         minHeight: variables.componentSizeLarge,
         justifyContent: 'center',
@@ -470,7 +468,7 @@ const styles = {
     },
 
     buttonText: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -491,7 +489,7 @@ const styles = {
         paddingTop: 4,
         paddingHorizontal: 14,
         paddingBottom: 4,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonMedium: {
@@ -501,7 +499,7 @@ const styles = {
         paddingRight: 16,
         paddingBottom: 12,
         paddingLeft: 16,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonLarge: {
@@ -511,7 +509,7 @@ const styles = {
         paddingRight: 10,
         paddingBottom: 8,
         paddingLeft: 18,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonSmallText: {
@@ -536,12 +534,12 @@ const styles = {
     },
 
     buttonDefaultHovered: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
         borderWidth: 0,
     },
 
     buttonSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         borderWidth: 0,
     },
 
@@ -550,29 +548,29 @@ const styles = {
     },
 
     buttonSuccessHovered: {
-        backgroundColor: themeColors.successHover,
+        backgroundColor: theme.successHover,
         borderWidth: 0,
     },
 
     buttonDanger: {
-        backgroundColor: themeColors.danger,
+        backgroundColor: theme.danger,
         borderWidth: 0,
     },
 
     buttonDangerHovered: {
-        backgroundColor: themeColors.dangerHover,
+        backgroundColor: theme.dangerHover,
         borderWidth: 0,
     },
 
     buttonDisabled: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
         borderWidth: 0,
     },
 
     buttonDivider: {
         height: variables.dropDownButtonDividerHeight,
         borderWidth: 0.7,
-        borderColor: themeColors.text,
+        borderColor: theme.text,
     },
 
     noBorderRadius: {
@@ -617,19 +615,19 @@ const styles = {
     },
 
     buttonSuccessText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     buttonDangerText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     hoveredComponentBG: {
-        backgroundColor: themeColors.hoverComponentBG,
+        backgroundColor: theme.hoverComponentBG,
     },
 
     activeComponentBG: {
-        backgroundColor: themeColors.activeComponentBG,
+        backgroundColor: theme.activeComponentBG,
     },
 
     fontWeightBold: {
@@ -659,7 +657,7 @@ const styles = {
         height: 140,
     },
 
-    pickerSmall: (backgroundColor = themeColors.highlightBG) => ({
+    pickerSmall: (backgroundColor = theme.highlightBG) => ({
         inputIOS: {
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
@@ -668,23 +666,23 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             height: 26,
             opacity: 1,
             backgroundColor: 'transparent',
         },
         done: {
-            color: themeColors.text,
+            color: theme.text,
         },
         doneDepressed: {
             fontSize: defaultPickerStyles.done.fontSize,
         },
         modalViewMiddle: {
-            backgroundColor: themeColors.border,
+            backgroundColor: theme.border,
             borderTopWidth: 0,
         },
         modalViewBottom: {
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
         },
         inputWeb: {
             fontFamily: fontFamily.EXP_NEUE,
@@ -694,7 +692,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             appearance: 'none',
             height: 26,
             opacity: 1,
@@ -709,7 +707,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             height: 26,
             opacity: 1,
             backgroundColor: 'transparent',
@@ -725,7 +723,7 @@ const styles = {
     }),
 
     badge: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         borderRadius: 14,
         height: variables.iconSizeNormal,
         flexDirection: 'row',
@@ -734,31 +732,31 @@ const styles = {
     },
 
     badgeSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     badgeSuccessPressed: {
-        backgroundColor: themeColors.successHover,
+        backgroundColor: theme.successHover,
     },
 
     badgeAdHocSuccess: {
-        backgroundColor: themeColors.badgeAdHoc,
+        backgroundColor: theme.badgeAdHoc,
     },
 
     badgeAdHocSuccessPressed: {
-        backgroundColor: themeColors.badgeAdHocHover,
+        backgroundColor: theme.badgeAdHocHover,
     },
 
     badgeDanger: {
-        backgroundColor: themeColors.danger,
+        backgroundColor: theme.danger,
     },
 
     badgeDangerPressed: {
-        backgroundColor: themeColors.dangerPressed,
+        backgroundColor: theme.dangerPressed,
     },
 
     badgeText: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightNormal,
         ...whiteSpace.noWrap,
@@ -767,21 +765,37 @@ const styles = {
     border: {
         borderWidth: 1,
         borderRadius: variables.componentBorderRadius,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderColorFocus: {
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
     },
 
     borderColorDanger: {
-        borderColor: themeColors.danger,
+        borderColor: theme.danger,
+    },
+
+    textInputDisabled: {
+        // Adding disabled color theme to indicate user that the field is not editable.
+        backgroundColor: theme.highlightBG,
+        borderBottomWidth: 2,
+        borderColor: theme.borderLighter,
+        // Adding browser specefic style to bring consistency between Safari and other platforms.
+        // Applying the Webkit styles only to browsers as it is not available in native.
+        ...(Browser.getBrowser()
+            ? {
+                  WebkitTextFillColor: theme.textSupporting,
+                  WebkitOpacity: 1,
+              }
+            : {}),
+        color: theme.textSupporting,
     },
 
     uploadReceiptView: (isSmallScreenWidth) => ({
         borderRadius: variables.componentBorderRadiusLarge,
         borderWidth: isSmallScreenWidth ? 0 : 2,
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
         borderStyle: 'dotted',
         marginBottom: 20,
         marginLeft: 20,
@@ -800,8 +814,8 @@ const styles = {
         borderRadius: 28,
         borderStyle: 'solid',
         borderWidth: 8,
-        backgroundColor: Colors.greenHighlightBackground,
-        borderColor: Colors.greenAppBackground,
+        backgroundColor: theme.highlightBG,
+        borderColor: theme.appBG,
     },
 
     permissionView: {
@@ -812,14 +826,14 @@ const styles = {
     },
 
     headerAnonymousFooter: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
     },
 
     headerText: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -844,7 +858,7 @@ const styles = {
     },
 
     chatItemComposeSecondaryRowSubText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightSmall,
@@ -905,7 +919,7 @@ const styles = {
     },
 
     calendarDayContainerSelected: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     /**
@@ -931,7 +945,7 @@ const styles = {
         height: '100%',
         backgroundColor: 'transparent',
         borderBottomWidth: 2,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         overflow: 'hidden',
     },
 
@@ -940,7 +954,7 @@ const styles = {
         left: 0,
         top: 0,
         fontSize: variables.fontSizeNormal,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         width: '100%',
     },
@@ -950,7 +964,7 @@ const styles = {
         top: 0,
         width: '100%',
         height: 23,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
     },
 
     textInputLabelDesktop: {
@@ -965,7 +979,7 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         lineHeight: variables.lineHeightXLarge,
-        color: themeColors.text,
+        color: theme.text,
         paddingTop: 23,
         paddingBottom: 8,
         paddingLeft: 0,
@@ -1004,9 +1018,9 @@ const styles = {
         backgroundColor: 'transparent',
         borderRadius: variables.componentBorderRadiusNormal,
         height: variables.inputComponentSizeNormal,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         paddingLeft: 12,
@@ -1029,7 +1043,7 @@ const styles = {
     },
 
     textInputPrefix: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         textAlignVertical: 'center',
@@ -1039,7 +1053,7 @@ const styles = {
         borderBottomWidth: 2,
         paddingLeft: 0,
         borderStyle: 'solid',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         justifyContent: 'center',
         backgroundColor: 'transparent',
         height: variables.inputHeight,
@@ -1057,7 +1071,7 @@ const styles = {
         zIndex: 1,
     },
 
-    picker: (disabled = false, backgroundColor = themeColors.appBG) => ({
+    picker: (disabled = false, backgroundColor = theme.appBG) => ({
         iconContainer: {
             top: Math.round(variables.inputHeight * 0.5) - 11,
             right: 0,
@@ -1067,63 +1081,63 @@ const styles = {
         inputWeb: {
             appearance: 'none',
             ...(disabled ? cursor.cursorDisabled : cursor.cursorPointer),
-            ...picker,
+            ...picker(theme),
             backgroundColor,
         },
 
         inputIOS: {
-            ...picker,
+            ...picker(theme),
         },
         done: {
-            color: themeColors.text,
+            color: theme.text,
         },
         doneDepressed: {
             fontSize: defaultPickerStyles.done.fontSize,
         },
         modalViewMiddle: {
-            backgroundColor: themeColors.border,
+            backgroundColor: theme.border,
             borderTopWidth: 0,
         },
         modalViewBottom: {
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
         },
 
         inputAndroid: {
-            ...picker,
+            ...picker(theme),
         },
     }),
 
     disabledText: {
-        color: themeColors.icon,
+        color: theme.icon,
     },
 
     inputDisabled: {
-        backgroundColor: themeColors.highlightBG,
-        color: themeColors.icon,
+        backgroundColor: theme.highlightBG,
+        color: theme.icon,
     },
 
     noOutline: addOutlineWidth({}, 0),
 
     errorOutline: {
-        borderColor: themeColors.danger,
+        borderColor: theme.danger,
     },
 
     textLabelSupporting: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     textLabelError: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textError,
+        color: theme.textError,
     },
 
     textReceiptUpload: {
         ...headlineFont,
         fontSize: variables.fontSizeXLarge,
-        color: themeColors.textLight,
+        color: theme.textLight,
         textAlign: 'center',
     },
 
@@ -1131,13 +1145,13 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         lineHeight: variables.lineHeightLarge,
         textAlign: 'center',
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     furtherDetailsText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
     lh16: {
@@ -1153,35 +1167,35 @@ const styles = {
     },
 
     formHelp: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.lineHeightLarge,
         marginBottom: 4,
     },
 
     formError: {
-        color: themeColors.textError,
+        color: theme.textError,
         fontSize: variables.fontSizeLabel,
         lineHeight: variables.formErrorLineHeight,
         marginBottom: 4,
     },
 
     formSuccess: {
-        color: themeColors.success,
+        color: theme.success,
         fontSize: variables.fontSizeLabel,
         lineHeight: 18,
         marginBottom: 4,
     },
 
     desktopRedirectPage: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         minHeight: '100%',
         flex: 1,
         alignItems: 'center',
     },
 
     signInPage: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         minHeight: '100%',
         flex: 1,
     },
@@ -1261,7 +1275,7 @@ const styles = {
 
     // Sidebar Styles
     sidebar: {
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         height: '100%',
     },
 
@@ -1279,14 +1293,14 @@ const styles = {
     },
 
     sidebarAvatar: {
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 20,
         height: variables.componentSizeNormal,
         width: variables.componentSizeNormal,
     },
 
-    statusIndicator: (backgroundColor = themeColors.danger) => ({
-        borderColor: themeColors.sidebar,
+    statusIndicator: (backgroundColor = theme.danger) => ({
+        borderColor: theme.sidebar,
         backgroundColor,
         borderRadius: 8,
         borderWidth: 2,
@@ -1308,7 +1322,7 @@ const styles = {
     },
 
     floatingActionButton: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         height: variables.componentSizeLarge,
         width: variables.componentSizeLarge,
         borderRadius: 999,
@@ -1317,7 +1331,7 @@ const styles = {
     },
 
     sidebarFooterUsername: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeLabel,
         fontWeight: '700',
         width: 200,
@@ -1327,7 +1341,7 @@ const styles = {
     },
 
     sidebarFooterLink: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         textDecorationLine: 'none',
         fontFamily: fontFamily.EXP_NEUE,
@@ -1388,7 +1402,7 @@ const styles = {
     createMenuHeaderText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverMenuItem: {
@@ -1408,7 +1422,7 @@ const styles = {
 
     popoverMenuText: {
         fontSize: variables.fontSizeNormal,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverInnerContainer: {
@@ -1438,28 +1452,28 @@ const styles = {
     },
 
     sidebarLinkText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeNormal,
         textDecorationLine: 'none',
         overflow: 'hidden',
     },
 
     sidebarLinkHover: {
-        backgroundColor: themeColors.sidebarHover,
+        backgroundColor: theme.sidebarHover,
     },
 
     sidebarLinkActive: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         textDecorationLine: 'none',
     },
 
     sidebarLinkTextBold: {
         fontWeight: '700',
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     sidebarLinkActiveText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeNormal,
         textDecorationLine: 'none',
         overflow: 'hidden',
@@ -1472,7 +1486,7 @@ const styles = {
 
     optionDisplayName: {
         fontFamily: fontFamily.EXP_NEUE,
-        height: variables.alternateTextHeight,
+        minHeight: variables.alternateTextHeight,
         lineHeight: variables.lineHeightXLarge,
         ...whiteSpace.noWrap,
     },
@@ -1509,6 +1523,14 @@ const styles = {
         paddingBottom: 12,
     },
 
+    optionRowSelected: {
+        backgroundColor: theme.activeComponentBG,
+    },
+
+    optionRowDisabled: {
+        color: theme.textSupporting,
+    },
+
     optionRowCompact: {
         height: variables.optionRowHeightCompact,
         paddingTop: 12,
@@ -1520,8 +1542,14 @@ const styles = {
     },
 
     overlayStyles: (current) => ({
-        ...StyleSheet.absoluteFillObject,
-        backgroundColor: themeColors.overlay,
+        position: 'fixed',
+
+        // We need to stretch the overlay to cover the sidebar and the translate animation distance.
+        left: -2 * variables.sideBarWidth,
+        top: 0,
+        bottom: 0,
+        right: 0,
+        backgroundColor: theme.shadow,
         opacity: current.progress.interpolate({
             inputRange: [0, 1],
             outputRange: [0, variables.overlayOpacity],
@@ -1530,7 +1558,7 @@ const styles = {
     }),
 
     appContent: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         overflow: 'hidden',
     },
 
@@ -1603,7 +1631,7 @@ const styles = {
     },
 
     chatItemMessageHeaderSender: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -1613,13 +1641,13 @@ const styles = {
 
     chatItemMessageHeaderTimestamp: {
         flexShrink: 0,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         paddingTop: 2,
     },
 
     chatItemMessage: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         lineHeight: variables.lineHeightXLarge,
@@ -1638,15 +1666,15 @@ const styles = {
     },
 
     chatItemComposeBoxColor: {
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     chatItemComposeBoxFocusedColor: {
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
     },
 
     chatItemComposeBox: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusRounded,
         minHeight: variables.componentSizeMedium,
@@ -1661,7 +1689,7 @@ const styles = {
         paddingLeft: 20,
         paddingRight: 20,
         display: 'flex',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     chatFooterFullCompose: {
@@ -1689,9 +1717,9 @@ const styles = {
     // Make sure you run the following tests against any changes: #12669
     textInputCompose: addOutlineWidth(
         {
-            backgroundColor: themeColors.componentBG,
-            borderColor: themeColors.border,
-            color: themeColors.text,
+            backgroundColor: theme.componentBG,
+            borderColor: theme.border,
+            color: theme.text,
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
             borderWidth: 0,
@@ -1719,7 +1747,7 @@ const styles = {
     },
 
     editInputComposeSpacing: {
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         marginVertical: 8,
     },
 
@@ -1732,13 +1760,13 @@ const styles = {
 
     textInputComposeBorder: {
         borderLeftWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     chatItemSubmitButton: {
         alignSelf: 'flex-end',
         borderRadius: variables.componentBorderRadiusRounded,
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         height: 40,
         padding: 10,
         margin: 3,
@@ -1746,11 +1774,11 @@ const styles = {
     },
 
     emojiPickerContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
     },
 
     emojiHeaderContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         display: 'flex',
         height: CONST.EMOJI_PICKER_HEADER_HEIGHT,
         justifyContent: 'center',
@@ -1762,7 +1790,7 @@ const styles = {
         ...spacing.pv1,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeSmall,
     },
 
@@ -1786,13 +1814,13 @@ const styles = {
 
     emojiItemHighlighted: {
         transition: '0.2s ease',
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     emojiItemKeyboardHighlighted: {
         transition: '0.2s ease',
         borderWidth: 1,
-        borderColor: themeColors.link,
+        borderColor: theme.link,
         borderRadius: variables.buttonBorderRadius,
     },
 
@@ -1819,7 +1847,7 @@ const styles = {
     },
 
     hoveredButton: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
     },
 
     composerSizeButton: {
@@ -1829,13 +1857,13 @@ const styles = {
         padding: 6,
         margin: 3,
         borderRadius: variables.componentBorderRadiusRounded,
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         justifyContent: 'center',
     },
 
     chatItemAttachmentPlaceholder: {
-        backgroundColor: themeColors.sidebar,
-        borderColor: themeColors.border,
+        backgroundColor: theme.sidebar,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
         height: 150,
@@ -1873,7 +1901,7 @@ const styles = {
     exampleCheckImage: {
         width: '100%',
         height: 80,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
     },
@@ -1881,14 +1909,14 @@ const styles = {
     singleAvatar: {
         height: 24,
         width: 24,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 24,
     },
 
     singleSubscript: {
         height: variables.iconSizeNormal,
         width: variables.iconSizeNormal,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 20,
         zIndex: 1,
     },
@@ -1896,7 +1924,7 @@ const styles = {
     singleAvatarSmall: {
         height: 18,
         width: 18,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 18,
     },
 
@@ -1952,8 +1980,8 @@ const styles = {
         right: -25,
         borderWidth: 3,
         borderRadius: 18,
-        borderColor: themeColors.cardBorder,
-        backgroundColor: themeColors.appBG,
+        borderColor: theme.cardBorder,
+        backgroundColor: theme.appBG,
     },
 
     avatarLarge: {
@@ -1974,7 +2002,7 @@ const styles = {
     },
 
     avatarInnerText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeSmall,
         lineHeight: undefined,
         marginLeft: -3,
@@ -1982,7 +2010,7 @@ const styles = {
     },
 
     avatarInnerTextSmall: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeExtraSmall,
         lineHeight: undefined,
         marginLeft: -2,
@@ -1995,13 +2023,13 @@ const styles = {
     },
 
     avatar: {
-        backgroundColor: themeColors.sidebar,
-        borderColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
+        borderColor: theme.sidebar,
     },
 
     focusedAvatar: {
-        backgroundColor: themeColors.border,
-        borderColor: themeColors.border,
+        backgroundColor: theme.border,
+        borderColor: theme.border,
     },
 
     emptyAvatar: {
@@ -2057,26 +2085,26 @@ const styles = {
 
     borderTop: {
         borderTopWidth: variables.borderTopWidth,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderTopRounded: {
         borderTopWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderTopLeftRadius: variables.componentBorderRadiusNormal,
         borderTopRightRadius: variables.componentBorderRadiusNormal,
     },
 
     borderBottomRounded: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderBottomLeftRadius: variables.componentBorderRadiusNormal,
         borderBottomRightRadius: variables.componentBorderRadiusNormal,
     },
 
     borderBottom: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderNone: {
@@ -2086,12 +2114,12 @@ const styles = {
 
     borderRight: {
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderLeft: {
         borderLeftWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     pointerEventsNone,
@@ -2116,7 +2144,7 @@ const styles = {
 
     imageModalPDF: {
         flex: 1,
-        backgroundColor: themeColors.modalBackground,
+        backgroundColor: theme.modalBackground,
     },
 
     PDFView: {
@@ -2124,7 +2152,7 @@ const styles = {
         // It's being used on Web/Desktop only to vertically center short PDFs,
         // while preventing the overflow of the top of long PDF files.
         display: 'grid',
-        backgroundColor: themeColors.modalBackground,
+        backgroundColor: theme.modalBackground,
         width: '100%',
         height: '100%',
         justifyContent: 'center',
@@ -2149,7 +2177,7 @@ const styles = {
         flexDirection: 'column',
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.modalBackdrop,
+        backgroundColor: theme.modalBackdrop,
     },
 
     centeredModalStyles: (isSmallScreenWidth, isFullScreenWhenSmall) => ({
@@ -2165,10 +2193,10 @@ const styles = {
     },
 
     defaultAttachmentView: {
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         borderRadius: variables.componentBorderRadiusNormal,
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         flexDirection: 'row',
         padding: 20,
         alignItems: 'center',
@@ -2176,7 +2204,7 @@ const styles = {
 
     notFoundSafeArea: {
         flex: 1,
-        backgroundColor: themeColors.heading,
+        backgroundColor: theme.heading,
     },
 
     notFoundView: {
@@ -2198,7 +2226,7 @@ const styles = {
 
     notFoundTextHeader: {
         ...headlineFont,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
         marginTop: 20,
@@ -2207,14 +2235,14 @@ const styles = {
     },
 
     notFoundTextBody: {
-        color: themeColors.componentBG,
+        color: theme.componentBG,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
         fontSize: 15,
     },
 
     notFoundButtonText: {
-        color: themeColors.link,
+        color: theme.link,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
         fontSize: 15,
@@ -2225,8 +2253,8 @@ const styles = {
     },
 
     defaultModalContainer: {
-        backgroundColor: themeColors.componentBG,
-        borderColor: themeColors.transparent,
+        backgroundColor: theme.componentBG,
+        borderColor: theme.transparent,
     },
 
     reportActionContextMenuMiniButton: {
@@ -2283,7 +2311,7 @@ const styles = {
     },
 
     twoFactorAuthSection: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         padding: 0,
     },
 
@@ -2301,7 +2329,7 @@ const styles = {
         return {
             alignItems: 'center',
             justifyContent: 'center',
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
             paddingVertical: 28,
             borderRadius: 16,
             marginTop: 32,
@@ -2352,7 +2380,7 @@ const styles = {
             justifyContent: 'space-between',
         }),
         padding: 20,
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         borderRadius: variables.componentBorderRadiusLarge,
         overflow: 'hidden',
     }),
@@ -2372,7 +2400,7 @@ const styles = {
     anonymousRoomFooterLogoTaglineText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeMedium,
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
     signInButtonAvatar: {
         width: 80,
@@ -2388,9 +2416,9 @@ const styles = {
     },
 
     roomHeaderAvatar: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         borderRadius: 100,
-        borderColor: themeColors.componentBG,
+        borderColor: theme.componentBG,
         borderWidth: 4,
     },
 
@@ -2400,7 +2428,7 @@ const styles = {
         right: 0,
         bottom: 0,
         left: 0,
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         opacity: variables.overlayOpacity,
         borderRadius: 88,
     },
@@ -2409,7 +2437,7 @@ const styles = {
     RHPNavigatorContainerNavigatorContainerStyles: (isSmallScreenWidth) => ({marginLeft: isSmallScreenWidth ? 0 : variables.sideBarWidth, flex: 1}),
 
     avatarInnerTextChat: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeXLarge,
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
         textAlign: 'center',
@@ -2428,7 +2456,7 @@ const styles = {
         fontSize: variables.fontSizeLarge,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     pageWrapper: {
@@ -2453,12 +2481,12 @@ const styles = {
     selectCircle: {
         width: variables.componentSizeSmall,
         height: variables.componentSizeSmall,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentSizeSmall / 2,
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         marginLeft: 8,
     },
 
@@ -2477,7 +2505,7 @@ const styles = {
 
     unreadIndicatorLine: {
         height: 1,
-        backgroundColor: themeColors.unreadIndicator,
+        backgroundColor: theme.unreadIndicator,
         flexGrow: 1,
         marginRight: 8,
         opacity: 0.5,
@@ -2485,13 +2513,13 @@ const styles = {
 
     threadDividerLine: {
         height: 1,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         flexGrow: 1,
         marginHorizontal: 20,
     },
 
     unreadIndicatorText: {
-        color: themeColors.unreadIndicator,
+        color: theme.unreadIndicator,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeSmall,
         fontWeight: fontWeightBold,
@@ -2503,11 +2531,11 @@ const styles = {
     },
 
     navigationSceneContainer: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     navigationScreenCardStyle: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         height: '100%',
     },
 
@@ -2545,6 +2573,13 @@ const styles = {
         position: 'absolute',
     },
 
+    attachmentRevealButtonContainer: {
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        ...spacing.ph4,
+    },
+
     arrowIcon: {
         height: 40,
         width: 40,
@@ -2556,7 +2591,7 @@ const styles = {
 
     detailsPageSectionVersion: {
         alignSelf: 'center',
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         height: 24,
         lineHeight: 20,
@@ -2568,11 +2603,11 @@ const styles = {
         justifyContent: 'center',
         borderRadius: 20,
         padding: 15,
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     switchInactive: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
     },
 
     switchThumb: {
@@ -2581,7 +2616,7 @@ const styles = {
         borderRadius: 11,
         position: 'absolute',
         left: 4,
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     switchThumbTransformation: (translateX) => ({
@@ -2589,11 +2624,11 @@ const styles = {
     }),
 
     radioButtonContainer: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         borderRadius: 10,
         height: 20,
         width: 20,
-        borderColor: themeColors.icon,
+        borderColor: theme.icon,
         borderWidth: 1,
         justifyContent: 'center',
         alignItems: 'center',
@@ -2607,7 +2642,7 @@ const styles = {
     },
 
     checkedContainer: {
-        backgroundColor: themeColors.checkBox,
+        backgroundColor: theme.checkBox,
     },
 
     magicCodeInputContainer: {
@@ -2618,7 +2653,7 @@ const styles = {
 
     magicCodeInput: {
         fontSize: variables.fontSizeXLarge,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2642,7 +2677,7 @@ const styles = {
     iouAmountText: {
         ...headlineFont,
         fontSize: variables.iouAmountTextSize,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2650,7 +2685,7 @@ const styles = {
         {
             ...headlineFont,
             fontSize: variables.iouAmountTextSize,
-            color: themeColors.heading,
+            color: theme.heading,
             padding: 0,
             lineHeight: undefined,
         },
@@ -2677,7 +2712,7 @@ const styles = {
     },
 
     moneyRequestPreviewBox: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         maxWidth: variables.sideBarWidth,
         width: '100%',
@@ -2703,7 +2738,7 @@ const styles = {
     moneyRequestPreviewAmount: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     defaultCheckmarkWrapper: {
@@ -2749,7 +2784,7 @@ const styles = {
     },
 
     fullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'center',
         alignItems: 'center',
@@ -2757,12 +2792,12 @@ const styles = {
     },
 
     navigatorFullScreenLoading: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         opacity: 1,
     },
 
     reimbursementAccountFullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'flex-start',
         alignItems: 'center',
@@ -2810,12 +2845,12 @@ const styles = {
     }),
 
     growlNotificationBox: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
         borderRadius: variables.componentBorderRadiusNormal,
         alignItems: 'center',
         flexDirection: 'row',
         justifyContent: 'space-between',
-        shadowColor: themeColors.shadow,
+        shadowColor: theme.shadow,
         ...spacing.p5,
     },
 
@@ -2824,12 +2859,12 @@ const styles = {
         fontFamily: fontFamily.EXP_NEUE,
         width: '90%',
         lineHeight: variables.fontSizeNormalHeight,
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         ...spacing.ml4,
     },
 
     blockquote: {
-        borderLeftColor: themeColors.border,
+        borderLeftColor: theme.border,
         borderLeftWidth: 4,
         paddingLeft: 12,
         marginVertical: 4,
@@ -2881,11 +2916,11 @@ const styles = {
 
     smallEditIcon: {
         alignItems: 'center',
-        backgroundColor: themeColors.buttonHoveredBG,
-        borderColor: themeColors.textReversed,
+        backgroundColor: theme.buttonHoveredBG,
+        borderColor: theme.textReversed,
         borderRadius: 14,
         borderWidth: 3,
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         height: 28,
         width: 28,
         justifyContent: 'center',
@@ -2902,7 +2937,7 @@ const styles = {
         height: 400,
         borderRadius: variables.componentBorderRadiusCard,
         overflow: 'hidden',
-        backgroundColor: themeColors.heroCard,
+        backgroundColor: theme.heroCard,
     },
 
     workspaceCardMobile: {
@@ -2945,18 +2980,18 @@ const styles = {
     },
 
     peopleRowBorderBottom: {
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderBottomWidth: 1,
         ...spacing.pb2,
     },
 
     peopleBadge: {
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         ...spacing.ph3,
     },
 
     peopleBadgeText: {
-        color: themeColors.textReversed,
+        color: theme.textReversed,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightNormal,
         ...whiteSpace.noWrap,
@@ -2982,7 +3017,7 @@ const styles = {
             flex: 1,
         },
         text: {
-            color: themeColors.textSupporting,
+            color: theme.textSupporting,
             textAlignVertical: 'center',
             fontSize: variables.fontSizeLabel,
         },
@@ -3002,7 +3037,7 @@ const styles = {
     },
 
     cardOverlay: {
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         position: 'absolute',
         top: 0,
         left: 0,
@@ -3019,18 +3054,18 @@ const styles = {
 
     shortTermsBorder: {
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     shortTermsHorizontalRule: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh3,
     },
 
     shortTermsLargeHorizontalRule: {
         borderWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh3,
     },
 
@@ -3053,7 +3088,7 @@ const styles = {
     shortTermsHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXXXLarge,
         lineHeight: variables.lineHeightXXXLarge,
     },
@@ -3065,7 +3100,7 @@ const styles = {
 
     collapsibleSectionBorder: {
         borderBottomWidth: 2,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
     },
 
     communicationsLinkHeight: {
@@ -3116,11 +3151,11 @@ const styles = {
 
     googleSearchSeparator: {
         height: 1,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
     },
 
     googleSearchText: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         lineHeight: variables.fontSizeNormalHeight,
         fontFamily: fontFamily.EXP_NEUE,
@@ -3158,7 +3193,7 @@ const styles = {
     keyboardShortcutTableContainer: {
         display: 'flex',
         width: '100%',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         height: 'auto',
         borderRadius: variables.componentBorderRadius,
         borderWidth: 1,
@@ -3167,7 +3202,7 @@ const styles = {
     keyboardShortcutTableRow: {
         flex: 1,
         flexDirection: 'row',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         flexBasis: 'auto',
         alignSelf: 'stretch',
         borderTopWidth: 1,
@@ -3176,7 +3211,7 @@ const styles = {
     keyboardShortcutTablePrefix: {
         width: '30%',
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     keyboardShortcutTableFirstRow: {
@@ -3184,18 +3219,18 @@ const styles = {
     },
 
     iPhoneXSafeArea: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
         flex: 1,
     },
 
     transferBalancePayment: {
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     transferBalanceSelectedPayment: {
-        borderColor: themeColors.iconSuccessFill,
+        borderColor: theme.iconSuccessFill,
     },
 
     transferBalanceBalance: {
@@ -3210,7 +3245,7 @@ const styles = {
         overflow: 'hidden',
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.imageCropBackgroundColor,
+        backgroundColor: theme.imageCropBackgroundColor,
         ...cursor.cursorMove,
     },
 
@@ -3221,7 +3256,7 @@ const styles = {
     },
 
     sliderKnob: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         position: 'absolute',
         height: variables.sliderKnobSize,
         width: variables.sliderKnobSize,
@@ -3231,7 +3266,7 @@ const styles = {
     },
 
     sliderBar: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         height: variables.sliderBarHeight,
         borderRadius: variables.sliderBarHeight / 2,
         alignSelf: 'stretch',
@@ -3246,7 +3281,7 @@ const styles = {
     },
 
     inlineSystemMessage: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         fontFamily: fontFamily.EXP_NEUE,
         marginLeft: 6,
@@ -3261,17 +3296,17 @@ const styles = {
     },
 
     invisibleOverlay: {
-        backgroundColor: themeColors.transparent,
+        backgroundColor: theme.transparent,
         zIndex: 1000,
     },
 
     reportDropOverlay: {
-        backgroundColor: themeColors.dropUIBG,
+        backgroundColor: theme.dropUIBG,
         zIndex: 2,
     },
 
     receiptDropOverlay: {
-        backgroundColor: themeColors.receiptDropUIBG,
+        backgroundColor: theme.receiptDropUIBG,
         zIndex: 2,
     },
 
@@ -3281,7 +3316,7 @@ const styles = {
     }),
 
     cardSection: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusCard,
         marginBottom: 20,
         marginHorizontal: 16,
@@ -3303,7 +3338,7 @@ const styles = {
     },
 
     callRequestSection: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         paddingHorizontal: 0,
         paddingBottom: 0,
         marginHorizontal: 0,
@@ -3325,7 +3360,7 @@ const styles = {
         flex: 1,
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     deeplinkWrapperMessage: {
@@ -3350,7 +3385,7 @@ const styles = {
     emojiReactionListHeader: {
         marginTop: 8,
         paddingBottom: 20,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
         borderBottomWidth: 1,
         marginHorizontal: 20,
     },
@@ -3358,7 +3393,7 @@ const styles = {
         paddingVertical: 2,
         paddingHorizontal: 8,
         borderRadius: 28,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         alignItems: 'center',
         justifyContent: 'center',
         flexDirection: 'row',
@@ -3371,7 +3406,7 @@ const styles = {
         paddingHorizontal: 20,
     },
     reactionListHeaderText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         marginLeft: 8,
         alignSelf: 'center',
     },
@@ -3393,7 +3428,7 @@ const styles = {
     },
 
     fontColorReactionLabel: {
-        color: '#586A64',
+        color: theme.tooltipSupportingText,
     },
 
     reactionEmojiTitle: {
@@ -3402,7 +3437,7 @@ const styles = {
     },
 
     textReactionSenders: {
-        color: themeColors.dark,
+        color: theme.tooltipPrimaryText,
         ...wordBreak.breakWord,
     },
 
@@ -3424,7 +3459,7 @@ const styles = {
     },
 
     validateCodeDigits: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeXXLarge,
         letterSpacing: 4,
@@ -3445,14 +3480,14 @@ const styles = {
 
     footerTitle: {
         fontSize: variables.fontSizeLarge,
-        color: themeColors.success,
+        color: theme.success,
         marginBottom: 16,
     },
 
     footerRow: {
         paddingVertical: 4,
         marginBottom: 8,
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeMedium,
     },
 
@@ -3463,7 +3498,7 @@ const styles = {
 
     listPickerSeparator: {
         height: 1,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     datePickerRoot: {
@@ -3472,7 +3507,7 @@ const styles = {
     },
 
     datePickerPopover: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         width: '100%',
         alignSelf: 'center',
         zIndex: 100,
@@ -3481,7 +3516,7 @@ const styles = {
 
     loginHeroHeader: {
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
-        color: themeColors.success,
+        color: theme.success,
         fontWeight: '500',
         textAlign: 'center',
     },
@@ -3495,14 +3530,14 @@ const styles = {
     loginHeroBody: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSignInHeroBody,
-        color: themeColors.textLight,
+        color: theme.textLight,
         textAlign: 'center',
     },
 
     linkPreviewWrapper: {
         marginTop: 16,
         borderLeftWidth: 4,
-        borderLeftColor: themeColors.border,
+        borderLeftColor: theme.border,
         paddingLeft: 12,
     },
 
@@ -3524,7 +3559,7 @@ const styles = {
     },
 
     whisper: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
     },
 
     contextMenuItemPopoverMaxWidth: {
@@ -3559,7 +3594,7 @@ const styles = {
     taskTitleDescription: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         lineHeight: variables.lineHeightNormal,
         ...spacing.mb1,
     },
@@ -3571,7 +3606,7 @@ const styles = {
 
     reportHorizontalRule: {
         borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh5,
         ...spacing.mv2,
     },
@@ -3602,13 +3637,13 @@ const styles = {
         paddingVertical: 20,
         borderRadius: 20,
         overflow: 'hidden',
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
         borderWidth: 2,
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
     },
 
     splashScreenHider: {
-        backgroundColor: themeColors.splashBG,
+        backgroundColor: theme.splashBG,
         alignItems: 'center',
         justifyContent: 'center',
     },
@@ -3704,7 +3739,7 @@ const styles = {
         marginLeft: 8,
         fontFamily: isSelected ? fontFamily.EXP_NEUE_BOLD : fontFamily.EXP_NEUE,
         fontWeight: isSelected ? fontWeightBold : 400,
-        color: isSelected ? themeColors.textLight : themeColors.textSupporting,
+        color: isSelected ? theme.textLight : theme.textSupporting,
     }),
 
     /**
@@ -3745,7 +3780,7 @@ const styles = {
 
     emojiPickerButtonDropdown: {
         justifyContent: 'center',
-        backgroundColor: themeColors.activeComponentBG,
+        backgroundColor: theme.activeComponentBG,
         width: 86,
         height: 52,
         borderRadius: 26,
@@ -3767,15 +3802,15 @@ const styles = {
     },
 
     reportPreviewBox: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         maxWidth: variables.sideBarWidth,
         width: '100%',
     },
 
     reportPreviewBoxHoverBorder: {
-        borderColor: themeColors.border,
-        backgroundColor: themeColors.border,
+        borderColor: theme.border,
+        backgroundColor: theme.border,
     },
 
     reportPreviewBoxBody: {
@@ -3785,7 +3820,7 @@ const styles = {
     reportActionItemImages: {
         flexDirection: 'row',
         borderWidth: 4,
-        borderColor: themeColors.transparent,
+        borderColor: theme.transparent,
         borderTopLeftRadius: variables.componentBorderRadiusLarge,
         borderTopRightRadius: variables.componentBorderRadiusLarge,
         borderBottomLeftRadius: variables.componentBorderRadiusLarge,
@@ -3805,13 +3840,13 @@ const styles = {
 
     reportActionItemImageBorder: {
         borderRightWidth: 2,
-        borderColor: themeColors.cardBG,
+        borderColor: theme.cardBG,
     },
 
     reportActionItemImagesMore: {
         position: 'absolute',
         borderRadius: 18,
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         width: 36,
         height: 36,
         display: 'flex',
@@ -3826,7 +3861,7 @@ const styles = {
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         marginRight: 12,
     },
 
@@ -3849,7 +3884,7 @@ const styles = {
     sidebarStatusAvatarContainer: {
         height: 44,
         width: 84,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         flexDirection: 'row',
         alignItems: 'center',
         justifyContent: 'space-between',
@@ -3869,7 +3904,7 @@ const styles = {
         ...spacing.mv3,
         overflow: 'hidden',
         borderWidth: 2,
-        borderColor: themeColors.cardBG,
+        borderColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         height: 200,
         maxWidth: 400,
@@ -3895,23 +3930,35 @@ const styles = {
         overflow: 'hidden',
     },
 
+    mapViewOverlay: {
+        flex: 1,
+        position: 'absolute',
+        left: 0,
+        top: 0,
+        borderRadius: variables.componentBorderRadiusLarge,
+        overflow: 'hidden',
+        backgroundColor: theme.highlightBG,
+        ...sizing.w100,
+        ...sizing.h100,
+    },
+
     confirmationListMapItem: {
         ...spacing.m5,
         height: 200,
     },
 
     mapDirection: {
-        lineColor: Colors.green,
+        lineColor: theme.success,
         lineWidth: 7,
     },
 
     mapDirectionLayer: {
         layout: {'line-join': 'round', 'line-cap': 'round'},
-        paint: {'line-color': Colors.green, 'line-width': 7},
+        paint: {'line-color': theme.success, 'line-width': 7},
     },
 
     mapPendingView: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         ...flex.flex1,
         borderRadius: variables.componentBorderRadiusLarge,
     },
@@ -3923,6 +3970,14 @@ const styles = {
         height: 30,
         width: '100%',
     },
-};
+});
+
+// For now we need to export the styles function that takes the theme as an argument
+// as something named different than "styles", because a lot of files import the "defaultStyles"
+// as "styles", which causes ESLint to throw an error.
+// TODO: Remove "stylesGenerator" and instead only return "styles" once the app is migrated to theme switching hooks and HOCs and "styles/theme/default.js" is not used anywhere anymore (GH issue: https://github.com/Expensify/App/issues/27337)
+const stylesGenerator = styles;
+const defaultStyles = styles(defaultTheme);
 
-export default styles;
+export default defaultStyles;
+export {stylesGenerator};
diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
index 5f69a7746cdc..c101a668666b 100644
--- a/src/styles/themes/default.js
+++ b/src/styles/themes/default.js
@@ -5,71 +5,68 @@ import ROUTES from '../../ROUTES';
 
 const darkTheme = {
     // Figma keys
-    appBG: colors.greenAppBackground,
-    splashBG: colors.green,
-    highlightBG: colors.greenHighlightBackground,
-    border: colors.greenBorders,
-    borderLighter: colors.greenBordersLighter,
-    borderFocus: colors.green,
-    icon: colors.greenIcons,
-    iconMenu: colors.green,
-    iconHovered: colors.white,
-    iconSuccessFill: colors.green,
-    iconReversed: colors.greenAppBackground,
+    appBG: colors.darkAppBackground,
+    splashBG: colors.green400,
+    highlightBG: colors.darkHighlightBackground,
+    border: colors.darkBorders,
+    borderLighter: colors.darkDefaultButton,
+    borderFocus: colors.green400,
+    icon: colors.darkIcons,
+    iconMenu: colors.green400,
+    iconHovered: colors.darkPrimaryText,
+    iconSuccessFill: colors.green400,
+    iconReversed: colors.darkAppBackground,
     iconColorfulBackground: `${colors.ivory}cc`,
-    textSupporting: colors.greenSupportingText,
-    text: colors.white,
+    textSupporting: colors.darkSupportingText,
+    text: colors.darkPrimaryText,
     textColorfulBackground: colors.ivory,
-    link: colors.blueLink,
-    linkHover: colors.blueLinkHover,
-    buttonDefaultBG: colors.greenDefaultButton,
-    buttonDisabledBG: colors.greenDefaultButtonDisabled,
-    buttonHoveredBG: colors.greenDefaultButtonHover,
-    buttonPressedBG: colors.greenDefaultButtonPressed,
+    link: colors.blue300,
+    linkHover: colors.blue100,
+    buttonDefaultBG: colors.darkDefaultButton,
+    buttonHoveredBG: colors.darkDefaultButtonHover,
+    buttonPressedBG: colors.darkDefaultButtonPressed,
     danger: colors.red,
     dangerHover: colors.redHover,
     dangerPressed: colors.redHover,
-    warning: colors.yellow,
-    success: colors.green,
+    warning: colors.yellow400,
+    success: colors.green400,
     successHover: colors.greenHover,
     successPressed: colors.greenPressed,
     transparent: colors.transparent,
-    midtone: colors.green700,
     signInPage: colors.green800,
-    dark: colors.midnight,
 
     // Additional keys
-    overlay: colors.greenHighlightBackground,
-    inverse: colors.white,
+    overlay: colors.darkHighlightBackground,
+    inverse: colors.darkPrimaryText,
     shadow: colors.black,
-    componentBG: colors.greenAppBackground,
-    hoverComponentBG: colors.greenHighlightBackground,
-    activeComponentBG: colors.greenBorders,
+    componentBG: colors.darkAppBackground,
+    hoverComponentBG: colors.darkHighlightBackground,
+    activeComponentBG: colors.darkBorders,
     signInSidebar: colors.green800,
-    sidebar: colors.greenHighlightBackground,
-    sidebarHover: colors.greenAppBackground,
-    heading: colors.white,
-    textLight: colors.white,
-    textDark: colors.greenAppBackground,
-    textReversed: colors.greenAppBackground,
-    textBackground: colors.greenHighlightBackground,
-    textMutedReversed: colors.greenIcons,
+    sidebar: colors.darkHighlightBackground,
+    sidebarHover: colors.darkAppBackground,
+    heading: colors.darkPrimaryText,
+    textLight: colors.darkPrimaryText,
+    textDark: colors.darkAppBackground,
+    textReversed: colors.lightPrimaryText,
+    textBackground: colors.darkHighlightBackground,
+    textMutedReversed: colors.darkIcons,
     textError: colors.red,
-    offline: colors.greenIcons,
-    modalBackdrop: colors.greenHighlightBackground,
-    modalBackground: colors.greenAppBackground,
-    cardBG: colors.greenHighlightBackground,
-    cardBorder: colors.greenHighlightBackground,
-    spinner: colors.greenSupportingText,
-    unreadIndicator: colors.green,
-    placeholderText: colors.greenIcons,
-    heroCard: colors.blue,
-    uploadPreviewActivityIndicator: colors.greenHighlightBackground,
+    offline: colors.darkIcons,
+    modalBackdrop: colors.darkHighlightBackground,
+    modalBackground: colors.darkAppBackground,
+    cardBG: colors.darkHighlightBackground,
+    cardBorder: colors.darkHighlightBackground,
+    spinner: colors.darkSupportingText,
+    unreadIndicator: colors.green400,
+    placeholderText: colors.darkIcons,
+    heroCard: colors.blue400,
+    uploadPreviewActivityIndicator: colors.darkHighlightBackground,
     dropUIBG: 'rgba(6,27,9,0.92)',
     receiptDropUIBG: 'rgba(3, 212, 124, 0.84)',
-    checkBox: colors.green,
-    pickerOptionsTextColor: colors.white,
-    imageCropBackgroundColor: colors.greenIcons,
+    checkBox: colors.green400,
+    pickerOptionsTextColor: colors.darkPrimaryText,
+    imageCropBackgroundColor: colors.darkIcons,
     fallbackIconColor: colors.green700,
     reactionActiveBackground: colors.green600,
     reactionActiveText: colors.green100,
@@ -79,6 +76,11 @@ const darkTheme = {
     mentionBG: colors.blue600,
     ourMentionText: colors.green100,
     ourMentionBG: colors.green600,
+    tooltipSupportingText: colors.lightSupportingText,
+    tooltipPrimaryText: colors.lightPrimaryText,
+    skeletonLHNIn: colors.darkBorders,
+    skeletonLHNOut: colors.darkDefaultButton,
+    QRLogo: colors.green400,
     starDefaultBG: 'rgb(254, 228, 94)',
 };
 
@@ -86,66 +88,9 @@ darkTheme.PAGE_BACKGROUND_COLORS = {
     [SCREENS.HOME]: darkTheme.sidebar,
     [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
     [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
-    [ROUTES.I_KNOW_A_TEACHER]: colors.orange800,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
+    [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
     [ROUTES.SETTINGS_SECURITY]: colors.ice500,
 };
 
-const oldTheme = {
-    shadow: colors.black,
-    link: colors.blue,
-    linkHover: colors.blueHover,
-    componentBG: colors.white,
-    hoverComponentBG: colors.gray1,
-    activeComponentBG: colors.gray2,
-    appBG: colors.white,
-    heading: colors.dark,
-    sidebar: colors.gray1,
-    sidebarHover: colors.white,
-    border: colors.gray2,
-    borderFocus: colors.blue,
-    icon: colors.gray3,
-    iconMenu: colors.gray3,
-    iconHovered: colors.dark,
-    iconSuccessFill: colors.green,
-    iconReversed: colors.white,
-    textSupporting: colors.gray4,
-    text: colors.dark,
-    textError: colors.oldRed,
-    textBackground: colors.gray1,
-    textReversed: colors.white,
-    textMutedReversed: colors.gray3,
-    buttonDefaultBG: colors.gray2,
-    offline: colors.gray3,
-    modalBackdrop: colors.gray3,
-    modalBackground: colors.gray2,
-    buttonDisabledBG: colors.gray2,
-    buttonHoveredBG: colors.gray1,
-    buttonPressedBG: colors.gray2,
-    spinner: colors.gray4,
-    unreadIndicator: colors.green,
-    placeholderText: colors.gray3,
-    heroCard: colors.blue,
-    uploadPreviewActivityIndicator: colors.gray1,
-    dropUIBG: 'rgba(6,27,9,0.92)',
-    cardBG: colors.gray1,
-    cardBorder: colors.gray1,
-    checkBox: colors.blue,
-    overlay: colors.gray1,
-
-    // Merging new Keys for Dark Mode merge. Delete after new branding is implemented.
-    highlightBG: colors.gray1,
-    danger: colors.oldRed,
-    dangerHover: colors.oldRedHover,
-    dangerPressed: colors.oldRedHover,
-    dangerDisabled: colors.oldRedDisabled,
-    warning: colors.yellow,
-    success: colors.green,
-    successHover: colors.greenHover,
-    successPressed: colors.greenPressed,
-    transparent: colors.transparent,
-    inverse: colors.dark,
-    textLight: colors.white,
-    textDark: colors.dark,
-};
-
 export default darkTheme;
diff --git a/src/styles/themes/light.js b/src/styles/themes/light.js
new file mode 100644
index 000000000000..1a945cb84913
--- /dev/null
+++ b/src/styles/themes/light.js
@@ -0,0 +1,95 @@
+import colors from '../colors';
+import SCREENS from '../../SCREENS';
+import ROUTES from '../../ROUTES';
+
+const lightTheme = {
+    // Figma keys
+    appBG: colors.lightAppBackground,
+    splashBG: colors.green400,
+    highlightBG: colors.lightHighlightBackground,
+    border: colors.lightBorders,
+    borderLighter: colors.lightDefaultButtonPressed,
+    borderFocus: colors.green400,
+    icon: colors.lightIcons,
+    iconMenu: colors.green400,
+    iconHovered: colors.lightPrimaryText,
+    iconSuccessFill: colors.green400,
+    iconReversed: colors.lightAppBackground,
+    iconColorfulBackground: `${colors.ivory}cc`,
+    textColorfulBackground: colors.ivory,
+    textSupporting: colors.lightSupportingText,
+    text: colors.lightPrimaryText,
+    link: colors.blue600,
+    linkHover: colors.blue500,
+    buttonDefaultBG: colors.lightDefaultButton,
+    buttonHoveredBG: colors.lightDefaultButtonHover,
+    buttonPressedBG: colors.lightDefaultButtonPressed,
+    danger: colors.red,
+    dangerHover: colors.redHover,
+    dangerPressed: colors.redHover,
+    warning: colors.yellow400,
+    success: colors.green400,
+    successHover: colors.greenHover,
+    successPressed: colors.greenPressed,
+    transparent: colors.transparent,
+    signInPage: colors.green800,
+
+    // Additional keys
+    overlay: colors.lightHighlightBackground,
+    inverse: colors.lightPrimaryText,
+    shadow: colors.black,
+    componentBG: colors.lightAppBackground,
+    hoverComponentBG: colors.lightHighlightBackground,
+    activeComponentBG: colors.lightBorders,
+    signInSidebar: colors.green800,
+    sidebar: colors.lightHighlightBackground,
+    sidebarHover: colors.lightBorders,
+    heading: colors.lightPrimaryText,
+    textLight: colors.white,
+    textDark: colors.lightPrimaryText,
+    textReversed: colors.darkPrimaryText,
+    textBackground: colors.lightHighlightBackground,
+    textMutedReversed: colors.lightIcons,
+    textError: colors.red,
+    offline: colors.lightIcons,
+    modalBackdrop: colors.lightHighlightBackground,
+    modalBackground: colors.lightAppBackground,
+    cardBG: colors.lightHighlightBackground,
+    cardBorder: colors.lightHighlightBackground,
+    spinner: colors.lightSupportingText,
+    unreadIndicator: colors.green400,
+    placeholderText: colors.lightIcons,
+    heroCard: colors.blue400,
+    uploadPreviewActivityIndicator: colors.lightHighlightBackground,
+    dropUIBG: 'rgba(252, 251, 249, 0.92)',
+    dropTransparentOverlay: 'rgba(255,255,255,0)',
+    checkBox: colors.green400,
+    pickerOptionsTextColor: colors.lightPrimaryText,
+    imageCropBackgroundColor: colors.lightIcons,
+    fallbackIconColor: colors.green700,
+    reactionActiveBackground: colors.green100,
+    reactionActiveText: colors.green600,
+    badgeAdHoc: colors.pink600,
+    badgeAdHocHover: colors.pink700,
+    mentionText: colors.blue600,
+    mentionBG: colors.blue100,
+    ourMentionText: colors.green600,
+    ourMentionBG: colors.green100,
+    tooltipSupportingText: colors.darkSupportingText,
+    tooltipPrimaryText: colors.darkPrimaryText,
+    skeletonLHNIn: colors.lightBorders,
+    skeletonLHNOut: colors.lightDefaultButtonPressed,
+    QRLogo: colors.green400,
+    starDefaultBG: 'rgb(254, 228, 94)',
+};
+
+lightTheme.PAGE_BACKGROUND_COLORS = {
+    [SCREENS.HOME]: lightTheme.sidebar,
+    [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
+    [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
+    [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
+    [ROUTES.SETTINGS_SECURITY]: colors.ice500,
+};
+
+export default lightTheme;
diff --git a/src/styles/useThemeStyles.ts b/src/styles/useThemeStyles.ts
index 77ee0edb6f95..a5b3baebbaec 100644
--- a/src/styles/useThemeStyles.ts
+++ b/src/styles/useThemeStyles.ts
@@ -8,6 +8,8 @@ function useThemeStyles() {
         throw new Error('StylesContext was null! Are you sure that you wrapped the component under a <ThemeStylesProvider>?');
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return themeStyles;
 }
 
diff --git a/src/styles/utilities/positioning.ts b/src/styles/utilities/positioning.ts
index fc505e4cb608..651d2a12f2ea 100644
--- a/src/styles/utilities/positioning.ts
+++ b/src/styles/utilities/positioning.ts
@@ -47,4 +47,7 @@ export default {
     b0: {
         bottom: 0,
     },
+    b2: {
+        bottom: 8,
+    },
 } satisfies Record<string, ViewStyle>;
diff --git a/src/styles/utilities/spacing.ts b/src/styles/utilities/spacing.ts
index 7147b1f2b7d4..a3667f05ac06 100644
--- a/src/styles/utilities/spacing.ts
+++ b/src/styles/utilities/spacing.ts
@@ -373,6 +373,10 @@ export default {
         paddingRight: 8,
     },
 
+    pr3: {
+        paddingRight: 12,
+    },
+
     pr4: {
         paddingRight: 16,
     },
diff --git a/src/types/onyx/IOU.ts b/src/types/onyx/IOU.ts
index 66f85c98d70c..7151bb84d1f1 100644
--- a/src/types/onyx/IOU.ts
+++ b/src/types/onyx/IOU.ts
@@ -19,6 +19,7 @@ type IOU = {
     receiptSource?: string;
     transactionID?: string;
     participants?: Participant[];
+    tag?: string;
 };
 
 export default IOU;
diff --git a/src/types/onyx/OnyxUpdatesFromServer.ts b/src/types/onyx/OnyxUpdatesFromServer.ts
index 02a96d4ce230..50b1503b90bd 100644
--- a/src/types/onyx/OnyxUpdatesFromServer.ts
+++ b/src/types/onyx/OnyxUpdatesFromServer.ts
@@ -2,13 +2,18 @@ import {OnyxUpdate} from 'react-native-onyx';
 import Request from './Request';
 import Response from './Response';
 
+type OnyxUpdateEvent = {
+    eventType: string;
+    data: OnyxUpdate[];
+};
+
 type OnyxUpdatesFromServer = {
     type: 'https' | 'pusher';
     lastUpdateID: number | string;
     previousUpdateID: number | string;
     request?: Request;
     response?: Response;
-    updates?: OnyxUpdate[];
+    updates?: OnyxUpdateEvent[];
 };
 
-export default OnyxUpdatesFromServer;
+export type {OnyxUpdatesFromServer, OnyxUpdateEvent};
diff --git a/src/types/onyx/PolicyCategory.ts b/src/types/onyx/PolicyCategory.ts
new file mode 100644
index 000000000000..adaf16e1acec
--- /dev/null
+++ b/src/types/onyx/PolicyCategory.ts
@@ -0,0 +1,22 @@
+type PolicyCategory = {
+    /** Name of a category */
+    name: string;
+
+    /** Flag that determines if a category is active and able to be selected */
+    enabled: boolean;
+
+    /** If true, not adding a comment to a transaction with this category will trigger a violation */
+    areCommentsRequired: boolean;
+
+    /** "General Ledger code" that corresponds to this category in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+
+    /** An ID for this category from an external accounting system */
+    externalID: string;
+
+    /** The external accounting service that this category comes from */
+    origin: string;
+};
+
+export default PolicyCategory;
diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
new file mode 100644
index 000000000000..fe6bee3a1f31
--- /dev/null
+++ b/src/types/onyx/PolicyTag.ts
@@ -0,0 +1,13 @@
+type PolicyTag = {
+    /** Name of a Tag */
+    name: string;
+
+    /** Flag that determines if a tag is active and able to be selected */
+    enabled: boolean;
+
+    /** "General Ledger code" that corresponds to this tag in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+};
+
+export default PolicyTag;
diff --git a/src/types/onyx/RecentlyUsedTags.ts b/src/types/onyx/RecentlyUsedTags.ts
new file mode 100644
index 000000000000..1d6112514609
--- /dev/null
+++ b/src/types/onyx/RecentlyUsedTags.ts
@@ -0,0 +1,3 @@
+type RecentlyUsedTags = Record<string, string[]>;
+
+export default RecentlyUsedTags;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index d908c0b36ce1..a7bbaf848265 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -33,10 +33,11 @@ import ReimbursementAccountDraft from './ReimbursementAccountDraft';
 import WalletTransfer from './WalletTransfer';
 import ReceiptModal from './ReceiptModal';
 import MapboxAccessToken from './MapboxAccessToken';
-import OnyxUpdatesFromServer from './OnyxUpdatesFromServer';
+import {OnyxUpdatesFromServer, OnyxUpdateEvent} from './OnyxUpdatesFromServer';
 import Download from './Download';
 import PolicyMember from './PolicyMember';
 import Policy from './Policy';
+import PolicyCategory from './PolicyCategory';
 import Report from './Report';
 import ReportAction from './ReportAction';
 import ReportActionReactions from './ReportActionReactions';
@@ -45,6 +46,8 @@ import Transaction from './Transaction';
 import Form, {AddDebitCardForm} from './Form';
 import RecentWaypoints from './RecentWaypoints';
 import RecentlyUsedCategories from './RecentlyUsedCategories';
+import RecentlyUsedTags from './RecentlyUsedTags';
+import PolicyTag from './PolicyTag';
 
 export type {
     Account,
@@ -85,6 +88,7 @@ export type {
     Download,
     PolicyMember,
     Policy,
+    PolicyCategory,
     Report,
     ReportAction,
     ReportActionReactions,
@@ -93,6 +97,9 @@ export type {
     Form,
     AddDebitCardForm,
     OnyxUpdatesFromServer,
+    OnyxUpdateEvent,
     RecentWaypoints,
     RecentlyUsedCategories,
+    RecentlyUsedTags,
+    PolicyTag,
 };
diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
index 7dc47619ffed..f1a251e4e433 100644
--- a/tests/unit/OptionsListUtilsTest.js
+++ b/tests/unit/OptionsListUtilsTest.js
@@ -656,16 +656,7 @@ describe('OptionsListUtils', () => {
         const search = 'Food';
         const emptySearch = '';
         const wrongSearch = 'bla bla';
-        const recentlyUsedCategories = {
-            Taxi: {
-                enabled: false,
-                name: 'Taxi',
-            },
-            Restaurant: {
-                enabled: true,
-                name: 'Restaurant',
-            },
-        };
+        const recentlyUsedCategories = ['Taxi', 'Restaurant'];
         const selectedOptions = [
             {
                 name: 'Medical',
diff --git a/tests/unit/TranslateTest.js b/tests/unit/TranslateTest.js
index 9ac23d6b81b0..45d4a12b61f5 100644
--- a/tests/unit/TranslateTest.js
+++ b/tests/unit/TranslateTest.js
@@ -7,19 +7,19 @@ const CONST = require('../../src/CONST').default;
 
 const originalTranslations = _.clone(translations);
 translations.default = {
-    [CONST.LOCALES.EN]: {
+    [CONST.LOCALES.EN]: translations.flattenObject({
         testKey1: 'English',
         testKey2: 'Test Word 2',
         testKey3: 'Test Word 3',
         testKeyGroup: {
             testFunction: ({testVariable}) => `With variable ${testVariable}`,
         },
-    },
-    [CONST.LOCALES.ES]: {
+    }),
+    [CONST.LOCALES.ES]: translations.flattenObject({
         testKey1: 'Spanish',
         testKey2: 'Spanish Word 2',
-    },
-    [CONST.LOCALES.ES_ES]: {testKey1: 'Spanish ES'},
+    }),
+    [CONST.LOCALES.ES_ES]: translations.flattenObject({testKey1: 'Spanish ES'}),
 };
 
 describe('translate', () => {
@@ -38,14 +38,12 @@ describe('translate', () => {
 
     test('Test when key is not found in default', () => {
         expect(() => Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toThrow(Error);
-        expect(() => Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toThrow(Error);
     });
 
     test('Test when key is not found in default (Production Mode)', () => {
         const ORIGINAL_IS_IN_PRODUCTION = CONFIG.default.IS_IN_PRODUCTION;
         CONFIG.default.IS_IN_PRODUCTION = true;
         expect(Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toBe('testKey4');
-        expect(Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toBe('a.b.c');
         CONFIG.default.IS_IN_PRODUCTION = ORIGINAL_IS_IN_PRODUCTION;
     });
 
@@ -53,7 +51,6 @@ describe('translate', () => {
         const expectedValue = 'With variable Test Variable';
         const testVariable = 'Test Variable';
         expect(Localize.translate(CONST.LOCALES.EN, 'testKeyGroup.testFunction', {testVariable})).toBe(expectedValue);
-        expect(Localize.translate(CONST.LOCALES.EN, ['testKeyGroup', 'testFunction'], {testVariable})).toBe(expectedValue);
     });
 });
 
@@ -97,3 +94,45 @@ describe('Translation Keys', () => {
         });
     });
 });
+
+describe('flattenObject', () => {
+    it('It should work correctly', () => {
+        const func = ({content}) => `This is the content: ${content}`;
+        const simpleObject = {
+            common: {
+                yes: 'Yes',
+                no: 'No',
+            },
+            complex: {
+                activity: {
+                    none: 'No Activity',
+                    some: 'Some Activity',
+                },
+                report: {
+                    title: {
+                        expense: 'Expense',
+                        task: 'Task',
+                    },
+                    description: {
+                        none: 'No description',
+                    },
+                    content: func,
+                    messages: ['Hello', 'Hi', 'Sup!'],
+                },
+            },
+        };
+
+        const result = translations.flattenObject(simpleObject);
+        expect(result).toStrictEqual({
+            'common.yes': 'Yes',
+            'common.no': 'No',
+            'complex.activity.none': 'No Activity',
+            'complex.activity.some': 'Some Activity',
+            'complex.report.title.expense': 'Expense',
+            'complex.report.title.task': 'Task',
+            'complex.report.description.none': 'No description',
+            'complex.report.content': func,
+            'complex.report.messages': ['Hello', 'Hi', 'Sup!'],
+        });
+    });
+});
diff --git a/workflow_tests/README.md b/workflow_tests/README.md
new file mode 100644
index 000000000000..f5975a421120
--- /dev/null
+++ b/workflow_tests/README.md
@@ -0,0 +1,422 @@
+# Testing GitHub Actions workflows locally
+
+## Components
+The workflow testing framework consists mainly of 3 components:
+- [Jest](https://jestjs.io/) - testing framework, also used for [application tests](https://github.com/Expensify/App/tree/main/tests)
+- [Mock-github](https://github.com/kiegroup/mock-github) - package allowing for creation of local repositories, which can be used to make sure that the workflow tests have access only to these files that they should and that they won't modify the actual repository
+- [Act-js](https://github.com/kiegroup/act-js) - JS wrapper around [Act](https://github.com/nektos/act). Act is a tool that allows to run GitHub Actions workflows locally, and Act-js allows to configure and run Act from JS code, like Jest tests. It also provides additional tools like mocking workflow steps and retrieving the workflow output a JSON, which allows for comparison of the actual output with expected values
+
+## Setup
+- Install dependencies from `package.json` file with `npm install`
+- Make sure you have fulfilled the [prerequisites](https://github.com/nektos/act#necessary-prerequisites-for-running-act) for running `Act`
+- Install `Act` with `brew install act` and follow the documentation on [first Act run](https://github.com/nektos/act#first-act-run)
+- Set the environment variable `ACT_BINARY` to the path to your `Act` executable (`which act` if you're not sure what the path is)
+- You should be ready to run the tests now with `npm run workflow-test`
+- You can pre-generate new mocks/assertions/test files for a given workflow by running `npm run workflow-test:generate <workflow_file>`
+
+## Running
+- To run the workflow tests simply use
+  - `npm run workflow-test`
+  - this will run all the tests sequentially, which can take some time
+- To run a specific test suite you can use
+  - `npm run workflow-test -- -i <path_to_test_file>`
+  - this will run only the test from that specific test file
+- To run a specific test or subset of tests use
+  - `npm run workflow-test -- -t "<test_name_substring>"`
+  - this will run only the tests having `<test_name_substring>` in their name/description
+- You can combine these like `npm run workflow-test -- -i workflow_tests/preDeploy.test.js -t "single specific test"`
+- You can also use all other options which are normally usable with `jest`
+
+## Limitations
+Not all workflows can always be tested this way, for example:
+- Act and Act-js do not support all the runner types available in GitHub Actions, like `macOS` runners or some specific version of `Ubuntu` runners like `ubuntu-20.04-64core`. In these cases the job will be omitted entirely and cannot be tested
+- Testing more complex workflows in their entirety can be extremely time-consuming and cumbersome. It is often optimal to mock most of the steps with expressions printing the input and output conditions
+- Due to the way `Act` and `Act-js` handle workflow output, not much can be checked in the test. What is available, namely whether the job/step executed or not, whether it was successful or not and what its printed output was, should be enough in most scenarios
+- `Act` does not seem to support the conditions set on event parameters when determining whether to run the workflow or not, namely for a workflow defined with:
+```yaml
+on:
+  pull_request:
+    types: [opened, edited, reopened]
+```
+running `act pull_request -e event_data.json` with `event_data.json` having `{"action": "opened"}` will execute the workflow (as expected), running for example `act push` will not execute it (as expected), but running `act pull_request -e event_data.json` with `event_data.json` having for example `{"action": "assigned"}` **will still execute the workflow** even though it should only be executed with `action` being `opened`, `edited` or `reopened`. This only applies to running the workflow with `Act`, in the GitHub environment it still works as expected
+
+## File structure
+The testing framework file structure within the repository is as follows:
+- `App/` - main application folder
+  - `.github/` - GitHub Actions folder
+    - `workflows/` - workflows folder
+      - `<workflow_name>.yml` - workflow file
+      - `...` - other workflow files
+    - `...` - other GitHub Actions files
+  - `workflow_tests/` - workflow testing folder
+    - `jest.config.ts` - `Jest` configuration file
+    - `README.md` - this readme file
+    - `utils.js` - various utility functions used in multiple tests
+    - `<workflow_name>.test.js` - test suite file for a GitHub Actions workflow named `<workflow_name>`
+    - `mocks/` - folder with step mock definitions
+      - `<workflow_name>Mocks.js` - file with step mock definitions for the `../<workflow_name>.test.js` suite, or for the `<workflow_name>` workflow
+      - `...` - other step mock definition files
+    - `assertions/` - folder with output assertions
+      - `<workflow_name>Assertions.js` - file with output assertions for the `../<workflow_name>.test.js` suite, or for the `<workflow_name>` workflow
+      - `...` - other output assertion files
+    - `...` - other test suites
+  - `...` - other application files
+
+## Utility helpers
+`utils.js` file provides several helper methods to speed up the tests development and maintenance
+
+### `setUpActParams`
+`setUpActParams` allows for initiating the context in which Act will execute the workflow
+
+Parameters:
+- `act` - instance of previously created `Act` object that will be updated with new params
+- `event` - the name of the event, this can be any event name used by GitHub Actions, like `pull_request`, `push`, `workflow_dispatch`, etc.
+- `event_options` - object with options of the event, allowing for customising it for different scenarios, for example `push` event can be customised for pushing to different branches with options `{head: {ref: '<branch_name>'}}`
+- `secrets` - object with secret values provided, like `{<SECRET_NAME>: <secret_value>, ...}`
+- `github_token` - value of the GitHub token, analogous to providing `GITHUB_TOKEN` secret
+
+Returns an updated `Act` object instance
+
+Example:
+```javascript
+let act = new kieActJs.Act(repoPath, workflowPath);
+act = utils.setUpActParams(
+    act,
+    'push',
+    {head: {ref: 'main'}},
+    {OS_BOTIFY_TOKEN: 'dummy_token', GITHUB_ACTOR: 'Dummy Tester', SLACK_WEBHOOK: 'dummy_slack_webhook', LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_s3cr3t_p455word'},
+    'dummy_github_token',
+);
+```
+
+### `getMockStep`
+`getMockStep` allows for creating uniform mock step definitions compatible with `Act-js` and reduces time required, as well as possibility of errors/typos slipping in while developing tests. More complex behaviours have to be mocked manually
+
+Parameters:
+- `name` - name of the step that **must correspond to the `name` in the `<workflow>.yml` file**, otherwise the step cannot be found
+- `message` - the message to be printed to default output when mock gets executed
+- `job_id` - an optional id of the job that will be printed in `[]` square brackets along the `message`, useful when assessing the output with many steps from many jobs
+- `inputs` - a list of input parameters to be printed, useful when checking if the step had been executed with expected inputs
+- `in_envs` - a list of input environment variables, to be printed, useful when checking if the step had been executed in expected environment
+- `outputs` - an object with values which should be printed by the mock to `$GITHUB_OUTPUT`, useful for setting the step output
+- `out_envs` - an objects with values of environment variables set by the step in `$GITHUB_ENV`, useful for modifying the environment by the mock
+- `isSuccessful` - a boolean value indicating whether the step succeeds or not, exits with status `0` (if successful) or `1` (if not)
+
+Returns an object with step mock definition, ready to be provided to the `Act` object instance
+
+Example:
+```javascript
+let mockStep = utils.getMockStep(
+    'Name of the step from <workflow>.yml',
+    'Message to be printed',
+    'TEST_JOB',
+    ['INPUT_1', 'INPUT_2'],
+    ['ENV_1', 'ENV_2'],
+    {output_1: true, output_2: 'Some Result'},
+    {OUT_ENV: 'ENV_VALUE'},
+    false,      
+);
+```
+results in
+```javascript
+{
+    name: 'Name of the step from <workflow>.yml',
+    mockWith: 'echo [MOCK]'
+        + ' [TEST_JOB]'
+        + ' Message to be printed'
+        + ', INPUT_1="{{ inputs.INPUT_1 }}'
+        + ', INPUT_2="{{ inputs.INPUT_2 }}'
+        + ', ENV_1="{{ env.ENV_1 }}'
+        + ', ENV_1="{{ env.ENV_1 }}'
+        + '\necho "output_1=true" >> "$GITHUB_OUTPUT"',
+        + '\necho "output_2=Some Result" >> "$GITHUB_OUTPUT"',
+        + '\necho "OUT_ENV=ENV_VALUE" >> "$GITHUB_ENV"',
+        + '\nexit 1',
+}
+```
+
+### `getStepAssertion`
+`getStepAssertion` allows for creating uniform assertions for output from executed step, compatible with step mocks provided by `getMockStep`
+
+Parameters:
+- `name` - name of the step, **has to correspond to the name from `<workflow>.yml` file**, and the name in the step mock if applicable
+- `isSuccessful` - boolean value for checking if the step should have exited successfully
+- `expectedOutput` - an output that is expected from the step, compared directly - if provided the subsequent parameters are ignored
+- `jobId` - an optional expected job identifier
+- `message` - expected message printed by the step
+- `inputs` - expected input values provided to the step
+- `envs` - expected input environment variables for the step
+
+Returns an object with step expected output definition ready to be provided to `expect()` matcher
+
+Example:
+```javascript
+utils.getStepAssertion(
+    'Name of the step from <workflow>.yml',
+    false,
+    null,
+    'TEST_JOB',
+    'Message to be printed',
+    [{key: 'INPUT_1', value: true}, {key: 'INPUT_2', value: 'Some value'}],
+    [{key: 'PLAIN_ENV_VAR', value: 'Value'}, {key: 'SECRET_ENV_VAR', value: '***'}],
+)
+```
+results in
+```javascript
+{
+    name: 'Name of the step from <workflow>.yml',
+    status: 1,
+    output: '[MOCK]'
+        + ' [TEST_JOB]'
+        + ' Message to be printed'
+        + ', INPUT_1=true'
+        + ', INPUT_2=Some value'
+        + ', PLAIN_ENV_VAR=Value'
+        + ', SECRET_ENV_VAR=***',
+}
+```
+
+### `setJobRunners`
+`setJobRunners` overwrites the runner types for given jobs, helpful when the runner type in the workflow is not supported by `Act`
+
+Parameters:
+- `act` - instance of previously created `Act` object
+- `jobs` - object with keys being the IDs of the workflow jobs to be modified and values being the names of runners that should be used for them in the test
+- `workflowPath` - path to the workflow file to be updated, **NOTE**: this will modify the file, use the one from the local test repo, not from `App/.github/workflows`!
+
+Returns an `Act` object instance
+
+Let's say you have a workflow with a job using `macos-12` runner, which is unsupported by `Act` - in this case that job will simply be skipped altogether, not allowing you to test it in any way.
+```yaml
+iOS:
+  name: Build and deploy iOS
+  needs: validateActor
+  if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+  runs-on: macos-12
+  steps:
+```
+You can use this method to change the runner to something that is supported, like
+```javascript
+act = utils.setJobRunners(
+    act,
+    {
+        iOS: 'ubuntu-latest',
+    },
+    workflowPath,
+);
+```
+Now the test workflow will look as follows, which will allow you to run the job and do at least limited testing
+```yaml
+iOS:
+  name: Build and deploy iOS
+  needs: validateActor
+  if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+  runs-on: ubuntu-latest
+  steps:
+```
+
+## Typical test file
+The following is the typical test file content, which will be followed by a detailed breakdown
+```javascript
+const path = require('path');
+const kieActJs = require('@kie/act-js');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils');
+const assertions = require('./assertions/<workflow>Assertions');
+const mocks = require('./mocks/<workflow>Mocks');
+
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '<workflow>.yml'),
+        dest: '.github/workflows/<workflow>.yml',
+    },
+];
+
+beforeEach(async () => {
+    mockGithub = new kieMockGithub.MockGithub({
+        repo: {
+            testWorkflowsRepo: {
+                files: FILES_TO_COPY_INTO_TEST_REPO,
+            },
+        },
+    });
+
+    await mockGithub.setup();
+});
+
+afterEach(async () => {
+    await mockGithub.teardown();
+});
+
+describe('test some general behaviour', () => {
+    test('something happens - test if expected happened next', async () => {
+        // get path to the local test repo
+        const repoPath = mockGithub.repo.getPath('testWorkflowsRepo') || '';
+
+        // get path to the workflow file under test
+        const workflowPath = path.join(repoPath, '.github', 'workflows', '<workflow>.yml');
+
+        // instantiate Act in the context of the test repo and given workflow file
+        let act = new kieActJs.Act(repoPath, workflowPath);
+
+        // set run parameters
+        act = utils.setUpActParams(
+            act,
+            '<event>',
+            {head: {ref: '<branch_name>'}},
+            {'<SECRET_NAME>': '<secret_value'},
+            '<github_token>',
+        );
+
+        // set up mocks
+        const testMockSteps = {
+            '<job_1_name>': [
+                {
+                    name: '<step_1_1_name>',
+                    mockWith: '<mock_command>',
+                },
+                {
+                    name: '<step_1_2_name>',
+                    mockWith: '<mock_command>',
+                },
+            ],
+            '<job_2_name>': [
+                utils.getMockStep('<step_2_1_name>', '<message>'),
+                utils.getMockStep('<step_2_2_name>', '<message>'),
+            ],
+        };
+
+        // run an event and get the result
+        const result = await act
+            .runEvent('<event>', {
+                workflowFile: path.join(repoPath, '.github', 'workflows'),
+                mockSteps: testMockSteps,
+            });
+
+        // assert results (some steps can run in parallel to each other so the order is not assured
+        // therefore we can check which steps have been executed, but not the set job order
+        assertions.assertSomethingHappened(result);
+        assertions.assertSomethingDidNotHappen(result, false);
+    }, timeout);
+);
+```
+
+### Breakdown
+Define which files should be copied into the test repo. In this case we copy `actions`, `libs`, `scripts` folders in their entirety and just the one workflow file we want to test
+```javascript
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '<workflow>.yml'),
+        dest: '.github/workflows/<workflow>.yml',
+    },
+];
+```
+`beforeEach` gets executed before each test. Here we create the local test repository with the files defined in the `FILES_TO_COPY_INTO_TEST_REPO` variable. `testWorkflowRepo` is the name of the test repo and can be changed to whichever name you choose, just remember to use it later when accessing this repo. _Note that we can't use `beforeAll()` method, because while mocking steps `Act-js` modifies the workflow file copied into the test repo and thus mocking could persist between tests_
+```javascript
+beforeEach(async () => {
+    mockGithub = new kieMockGithub.MockGithub({
+        repo: {
+            testWorkflowsRepo: {
+                files: FILES_TO_COPY_INTO_TEST_REPO,
+            },
+        },
+    });
+
+    await mockGithub.setup();
+});
+```
+Similarly, `afterEach` gets executed after each test. In this case we remove the test repo after the test finishes
+```javascript
+afterEach(async () => {
+    await mockGithub.teardown();
+});
+```
+Get path to the local test repo, useful to have it in a variable
+```javascript
+const repoPath = mockGithub.repo.getPath('testWorkflowsRepo') || '';
+```
+Get path to the workflow under test. Note that it's the path **in the test repo**
+```javascript
+const workflowPath = path.join(repoPath, '.github', 'workflows', '<workflow>.yml');
+```
+Instantiate `Act` object instance. Here we provide the constructor with the path to the test repo (so that `Act` can execute in its context) and the path the workflow file under test (so just the workflow we want to test would be executed)
+```javascript
+let act = new kieActJs.Act(repoPath, workflowPath);
+```
+Set up initial parameters for `Act`. This is where we can set secrets, GitHub token and options for the events (like the name of the branch to which the push has been made, etc.)
+```javascript
+act = utils.setUpActParams(
+    act,
+    '<event>',
+    {head: {ref: '<branch_name>'}},
+    {'<SECRET_NAME>': '<secret_value'},
+    '<github_token>',
+);
+```
+Set up step mocks. Here we configure which steps in the workflow should be mocked, and with what behaviour. This takes form of an object with keys corresponding to the names of the jobs in the workflow, and values being mock definitions for specific steps. The steps can be identified either by `id`, `name`, `uses` or `run`. Step mock can be defined either by hand (`<job_1_name>`) or with the helper method `utils.getMockStep()` (`<job_2_name>`). Not mocked steps will be executed normally - **make sure this will not have unexpected consequences**
+```javascript
+const testMockSteps = {
+    '<job_1_name>': [
+        {
+            name: '<step_1_1_name>',
+            mockWith: '<mock_command>',
+        },
+        {
+            name: '<step_1_2_name>',
+            mockWith: '<mock_command>',
+        },
+    ],
+    '<job_2_name>': [
+        utils.getMockStep('<step_2_1_name>', '<message>'),
+        utils.getMockStep('<step_2_2_name>', '<message>'),
+    ],
+};
+```
+Most important part - actually running the event with `Act`. This executes the specified `<event>` in the context of the local test repo created before and with the workflow under test set up. `result` stores the output of `Act` execution, which can then be compared to what was expected. Note that the `workflowFile` is actually path to _workflow folder_ and not the file itself - `Act-js` determines the name of the workflow by itself, and tries to find it in the specified `workflowFile` path, so _providing the full path to the file will fail_
+```javascript
+const result = await act
+    .runEvent('<event>', {
+        workflowFile: path.join(repoPath, '.github', 'workflows'),
+        mockSteps: testMockSteps,
+    });
+```
+Assert results are as expected. This can, for example, include using `expect()` to check if the steps that should be executed have indeed been executed, steps that shouldn't run have not been executed, compare statuses (which steps succeeded, which failed) and step outputs. Outputs can include additional information, like input values, environmental variables, secrets (although these are usually not accessible and represented by `***`, this can still be useful to check if the value exists or not). Here it's usually done with the helper assertion methods defined in the assertions file. Step assertions can be created manually or with `getStepAssertion()` helper method
+```javascript
+assertions.assertSomethingHappened(result);
+assertions.assertSomethingDidNotHappen(result, false);
+```
+
+## FAQ
+### I'm positive that one of the jobs should run, but it doesn't - why?
+#### Check the runner type (`runs-on`) it may not be set (which `Act` does not like) or it may be set to one of the unsupported types (primarily the `macos-...` runner types). You can always overwrite the runner type with `utils.setJobRunners()` helper method
+### My workflow has many jobs, each with many steps, how do I start testing it without spending hours on setup?
+#### First of all, consider splitting the workflow into several smaller pieces, with the main one acting as coordinator and calling the others. Secondly, you can bootstrap the test with `npm run workflow-test:generate <workflow>.yml`, which will generate mocks and assertions for you, as well as the stub of the test file
+### After using `workflow-test:generate` the files are incomplete, or they have errors. Why?
+#### Make sure that the workflow file you want to test, has all steps with names, as the bootstrapping script uses step names to locate and mock them - same with assertions. After you've added the `name` properties to steps, remove the previously generated files and run the command again
+### I want to just run the test that I am working on, without all the others - how can I do it?
+#### You can pass parameters to the `npm run workflow-test` command as you would with `jest` or `npm test` - `npm run workflow-test -- -i <path/to/testfile>` will run just the tests within `testfile`. You can also filter further with `-t <part_of_test_name>`
diff --git a/workflow_tests/assertions/authorChecklistAssertions.js b/workflow_tests/assertions/authorChecklistAssertions.js
new file mode 100644
index 000000000000..c57fe922c754
--- /dev/null
+++ b/workflow_tests/assertions/authorChecklistAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('authorChecklist.js', true, null, 'CHECKLIST', 'Running authorChecklist.js', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertChecklistJobExecuted,
+};
diff --git a/workflow_tests/assertions/cherryPickAssertions.js b/workflow_tests/assertions/cherryPickAssertions.js
new file mode 100644
index 000000000000..42ecc3d64262
--- /dev/null
+++ b/workflow_tests/assertions/cherryPickAssertions.js
@@ -0,0 +1,119 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Check if user is deployer', true, null, 'VALIDATEACTOR', 'Checking if user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATENEWVERSION', 'Creating new version', [], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCherryPickJobExecuted = (workflowResult, user = 'Dummy Author', pullRequestNumber = '1234', didExecute = true, hasConflicts = false, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout staging branch',
+            true,
+            null,
+            'CHERRYPICK',
+            'Checking out staging branch',
+            [
+                {key: 'ref', value: 'staging'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Set up git for OSBotify', true, null, 'CHERRYPICK', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Get previous app version', true, null, 'CHERRYPICK', 'Get previous app version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}]),
+        utils.createStepAssertion('Fetch history of relevant refs', true, null, 'CHERRYPICK', 'Fetch history of relevant refs'),
+        utils.createStepAssertion('Get version bump commit', true, null, 'CHERRYPICK', 'Get version bump commit', [], []),
+        utils.createStepAssertion(
+            'Get merge commit for pull request to CP',
+            true,
+            null,
+            'CHERRYPICK',
+            'Get merge commit for pull request to CP',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'USER', value: user},
+                {key: 'PULL_REQUEST_NUMBER', value: pullRequestNumber},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Cherry-pick the version-bump to staging', true, null, 'CHERRYPICK', 'Cherry-picking the version-bump to staging', [], []),
+        utils.createStepAssertion('Cherry-pick the merge commit of target PR', true, null, 'CHERRYPICK', 'Cherry-picking the merge commit of target PR', [], []),
+        utils.createStepAssertion('Push changes', true, null, 'CHERRYPICK', 'Pushing changes', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const conflictSteps = [
+        utils.createStepAssertion(
+            'Create Pull Request to manually finish CP',
+            true,
+            null,
+            'CHERRYPICK',
+            'Creating Pull Request to manually finish CP',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    conflictSteps.forEach((step) => {
+        if (didExecute && hasConflicts) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion(
+            'Announces a CP failure in the #announce Slack room',
+            true,
+            null,
+            'CHERRYPICK',
+            'Announcing a CP failure',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertCreateNewVersionJobExecuted,
+    assertCherryPickJobExecuted,
+};
diff --git a/workflow_tests/assertions/claAssertions.js b/workflow_tests/assertions/claAssertions.js
new file mode 100644
index 000000000000..b85eb263d838
--- /dev/null
+++ b/workflow_tests/assertions/claAssertions.js
@@ -0,0 +1,73 @@
+const utils = require('../utils/utils');
+
+const assertCLAJobExecuted = (workflowResult, commentBody = '', githubRepository = '', didExecute = true, runAssistant = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'CLA comment check',
+            true,
+            null,
+            'CLA',
+            'CLA comment check',
+            [
+                {key: 'text', value: commentBody},
+                {key: 'regex', value: '\\s*I have read the CLA Document and I hereby sign the CLA\\s*'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'CLA comment re-check',
+            true,
+            null,
+            'CLA',
+            'CLA comment re-check',
+            [
+                {key: 'text', value: commentBody},
+                {key: 'regex', value: '\\s*recheck\\s*'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const assistantSteps = [
+        utils.createStepAssertion(
+            'CLA Assistant',
+            true,
+            null,
+            'CLA',
+            'CLA Assistant',
+            [
+                {key: 'path-to-signatures', value: `${githubRepository}/cla.json`},
+                {key: 'path-to-document', value: `https://github.com/${githubRepository}/blob/main/contributingGuides/CLA.md`},
+                {key: 'branch', value: 'main'},
+                {key: 'remote-organization-name', value: 'Expensify'},
+                {key: 'remote-repository-name', value: 'CLA'},
+                {key: 'lock-pullrequest-aftermerge', value: false},
+                {key: 'allowlist', value: 'OSBotify,snyk-bot'},
+            ],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'PERSONAL_ACCESS_TOKEN', value: '***'},
+            ],
+        ),
+    ];
+
+    assistantSteps.forEach((step) => {
+        if (didExecute && runAssistant) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertCLAJobExecuted,
+};
diff --git a/workflow_tests/assertions/createNewVersionAssertions.js b/workflow_tests/assertions/createNewVersionAssertions.js
new file mode 100644
index 000000000000..e4526ae59be2
--- /dev/null
+++ b/workflow_tests/assertions/createNewVersionAssertions.js
@@ -0,0 +1,72 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Get user permissions', true, null, 'VALIDATEACTOR', 'Get user permissions', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertCreateNewVersionJobExecuted = (workflowResult, semverLevel = 'BUILD', didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Run turnstyle', true, null, 'CREATENEWVERSION', 'Run turnstyle', [{key: 'poll-interval-seconds', value: '10'}], [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion(
+            'Check out',
+            true,
+            null,
+            'CREATENEWVERSION',
+            'Check out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'CREATENEWVERSION', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion(
+            'Generate version',
+            true,
+            null,
+            'CREATENEWVERSION',
+            'Generate version',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SEMVER_LEVEL', value: semverLevel},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Commit new version', true, null, 'CREATENEWVERSION', 'Commit new version', [], []),
+        utils.createStepAssertion('Update main branch', true, null, 'CREATENEWVERSION', 'Update main branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            if (isSuccessful) {
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CREATENEWVERSION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertCreateNewVersionJobExecuted,
+};
diff --git a/workflow_tests/assertions/deployAssertions.js b/workflow_tests/assertions/deployAssertions.js
new file mode 100644
index 000000000000..bff99298bde5
--- /dev/null
+++ b/workflow_tests/assertions/deployAssertions.js
@@ -0,0 +1,63 @@
+const utils = require('../utils/utils');
+
+const assertDeployStagingJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout staging branch', true, null, 'DEPLOY_STAGING', 'Checking out staging branch', [
+            {key: 'ref', value: 'staging'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_STAGING', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Tag version', true, null, 'DEPLOY_STAGING', 'Tagging new version'),
+        utils.createStepAssertion('🚀 Push tags to trigger staging deploy 🚀', true, null, 'DEPLOY_STAGING', 'Pushing tag to trigger staging deploy'),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDeployProductionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOY_PRODUCTION', 'Checking out', [
+            {key: 'ref', value: 'production'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_PRODUCTION', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Get current app version', true, null, 'DEPLOY_PRODUCTION', 'Getting current app version'),
+        utils.createStepAssertion('Get Release Pull Request List', true, null, 'DEPLOY_PRODUCTION', 'Getting release PR list', [
+            {key: 'TAG', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: 'true'},
+        ]),
+        utils.createStepAssertion('Generate Release Body', true, null, 'DEPLOY_PRODUCTION', 'Generating release body', [{key: 'PR_LIST', value: '[1.2.1, 1.2.2]'}]),
+        utils.createStepAssertion(
+            '🚀 Create release to trigger production deploy 🚀',
+            true,
+            null,
+            'DEPLOY_PRODUCTION',
+            'Creating release to trigger production deploy',
+            [
+                {key: 'tag_name', value: '1.2.3'},
+                {key: 'body', value: 'Release body'},
+            ],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertDeployStagingJobExecuted,
+    assertDeployProductionJobExecuted,
+};
diff --git a/workflow_tests/assertions/deployBlockerAssertions.js b/workflow_tests/assertions/deployBlockerAssertions.js
new file mode 100644
index 000000000000..8d2d6039960e
--- /dev/null
+++ b/workflow_tests/assertions/deployBlockerAssertions.js
@@ -0,0 +1,98 @@
+const utils = require('../utils/utils');
+
+const assertDeployBlockerJobExecuted = (workflowResult, issueTitle, issueNumber, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOYBLOCKER', 'Checkout', [{key: 'token', value: '***'}], []),
+        utils.createStepAssertion(
+            'Get URL, title, & number of new deploy blocker (issue)',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Get URL, title and number of new deploy blocker - issue',
+            [],
+            [{key: 'TITLE', value: issueTitle}],
+        ),
+        utils.createStepAssertion(
+            'Update StagingDeployCash with new deploy blocker',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Update StagingDeployCash with new deploy blocker',
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Give the issue/PR the Hourly, Engineering labels',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Give the issue/PR the Hourly, Engineering labels',
+            [
+                {key: 'add-labels', value: 'Hourly, Engineering'},
+                {key: 'remove-labels', value: 'Daily, Weekly, Monthly'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Comment on deferred PR',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Comment on deferred PR',
+            [
+                {key: 'github_token', value: '***'},
+                {key: 'number', value: issueNumber},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            if (isSuccessful) {
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const successSteps = [
+        utils.createStepAssertion(
+            'Post the issue in the #expensify-open-source slack room',
+            true,
+            null,
+            'DEPLOYBLOCKER',
+            'Post the issue in the expensify-open-source slack room',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    successSteps.forEach((step) => {
+        if (didExecute && isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'DEPLOYBLOCKER', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((step) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([step]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
+        }
+    });
+};
+
+module.exports = {
+    assertDeployBlockerJobExecuted,
+};
diff --git a/workflow_tests/assertions/finishReleaseCycleAssertions.js b/workflow_tests/assertions/finishReleaseCycleAssertions.js
new file mode 100644
index 000000000000..12a8b9f2b05d
--- /dev/null
+++ b/workflow_tests/assertions/finishReleaseCycleAssertions.js
@@ -0,0 +1,186 @@
+const utils = require('../utils/utils');
+
+const assertValidateJobExecuted = (workflowResult, issueNumber = '', didExecute = true, isTeamMember = true, hasBlockers = false, isSuccessful = true) => {
+    const steps = [utils.createStepAssertion('Validate actor is deployer', true, null, 'VALIDATE', 'Validating if actor is deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+    if (isTeamMember) {
+        steps.push(
+            utils.createStepAssertion(
+                'Check for any deploy blockers',
+                true,
+                null,
+                'VALIDATE',
+                'Checking for deploy blockers',
+                [
+                    {key: 'GITHUB_TOKEN', value: '***'},
+                    {key: 'ISSUE_NUMBER', value: issueNumber},
+                ],
+                [],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const notTeamMemberSteps = [
+        utils.createStepAssertion(
+            'Reopen and comment on issue (not a team member)',
+            true,
+            null,
+            'VALIDATE',
+            'Reopening issue - not a team member',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ISSUE_NUMBER', value: issueNumber},
+                {key: 'COMMENT', value: 'Sorry, only members of @Expensify/Mobile-Deployers can close deploy checklists.\nReopening!'},
+            ],
+            [],
+        ),
+    ];
+
+    notTeamMemberSteps.forEach((expectedStep) => {
+        if (didExecute && !isTeamMember) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const blockerSteps = [
+        utils.createStepAssertion(
+            'Reopen and comment on issue (has blockers)',
+            true,
+            null,
+            'VALIDATE',
+            'Reopening issue - blockers',
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ISSUE_NUMBER', value: issueNumber},
+            ],
+            [],
+        ),
+    ];
+
+    blockerSteps.forEach((expectedStep) => {
+        if (didExecute && hasBlockers) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'VALIDATE', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateProductionJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'UPDATEPRODUCTION',
+            'Checkout',
+            [
+                {key: 'ref', value: 'staging'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATEPRODUCTION', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Update production branch', true, null, 'UPDATEPRODUCTION', 'Updating production branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATEPRODUCTION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewPatchVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATENEWPATCHVERSION', 'Creating new version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'UPDATESTAGING',
+            'Checkout',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATESTAGING', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
+        utils.createStepAssertion('Update staging branch to trigger staging deploy', true, null, 'UPDATESTAGING', 'Updating staging branch', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failedSteps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATESTAGING', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failedSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateJobExecuted,
+    assertUpdateProductionJobExecuted,
+    assertCreateNewPatchVersionJobExecuted,
+    assertUpdateStagingJobExecuted,
+};
diff --git a/workflow_tests/assertions/lintAssertions.js b/workflow_tests/assertions/lintAssertions.js
new file mode 100644
index 000000000000..938f9b383464
--- /dev/null
+++ b/workflow_tests/assertions/lintAssertions.js
@@ -0,0 +1,22 @@
+const utils = require('../utils/utils');
+
+const assertLintJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'LINT', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'LINT', 'Setup Node', [], []),
+        utils.createStepAssertion('Lint JavaScript and Typescript with ESLint', true, null, 'LINT', 'Lint JavaScript with ESLint', [], [{key: 'CI', value: 'true'}]),
+        utils.createStepAssertion('Lint shell scripts with ShellCheck', true, null, 'LINT', 'Lint shell scripts with ShellCheck', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertLintJobExecuted,
+};
diff --git a/workflow_tests/assertions/lockDeploysAssertions.js b/workflow_tests/assertions/lockDeploysAssertions.js
new file mode 100644
index 000000000000..874076dc3a28
--- /dev/null
+++ b/workflow_tests/assertions/lockDeploysAssertions.js
@@ -0,0 +1,84 @@
+const utils = require('../utils/utils');
+
+const assertlockStagingDeploysJobExecuted = (workflowResult, didExecute = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Checking out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Wait for staging deploys to finish', true, null, 'LOCKSTAGINGDEPLOYS', 'Waiting for staging deploys to finish', [{key: 'GITHUB_TOKEN', value: '***'}], []),
+        utils.createStepAssertion(
+            'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Commenting in StagingDeployCash',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertlockStagingDeploysJobFailedAfterFirstStep = (workflowResult) => {
+    const steps = [
+        utils.createStepAssertion(
+            'Checkout',
+            true,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Checking out',
+            [
+                {key: 'ref', value: 'main'},
+                {key: 'token', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Wait for staging deploys to finish',
+            false,
+            null,
+            'LOCKSTAGINGDEPLOYS',
+            'Waiting for staging deploys to finish',
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+            [],
+        ),
+        utils.createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+    });
+};
+
+module.exports = {
+    assertlockStagingDeploysJobExecuted,
+    assertlockStagingDeploysJobFailedAfterFirstStep,
+};
diff --git a/workflow_tests/assertions/platformDeployAssertions.js b/workflow_tests/assertions/platformDeployAssertions.js
new file mode 100644
index 000000000000..35242cd24d31
--- /dev/null
+++ b/workflow_tests/assertions/platformDeployAssertions.js
@@ -0,0 +1,371 @@
+const utils = require('../utils/utils');
+
+const assertVerifyActorJobExecuted = (workflowResult, username, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Check if user is deployer', true, null, 'VALIDATE_ACTOR', 'Checking if the user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDeployChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DEPLOY_CHECKLIST', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'DEPLOY_CHECKLIST', 'Setup Node'),
+        utils.createStepAssertion('Set version', true, null, 'DEPLOY_CHECKLIST', 'Set version'),
+        utils.createStepAssertion('Create or update staging deploy', true, null, 'DEPLOY_CHECKLIST', 'Create or update staging deploy', [
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'NPM_VERSION', value: '1.2.3'},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertAndroidJobExecuted = (workflowResult, didExecute = true, isProduction = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'ANDROID', 'Checking out'),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setting up Node'),
+        utils.createStepAssertion('Setup Ruby', true, null, 'ANDROID', 'Setting up Ruby', [
+            {key: 'ruby-version', value: '2.7'},
+            {key: 'bundler-cache', value: 'true'},
+        ]),
+        utils.createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypting keystore', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypting JSON key', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Set version in ENV', true, null, 'ANDROID', 'Setting version in ENV'),
+    ];
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Run Fastlane beta', true, null, 'ANDROID', 'Running Fastlane beta', null, [
+                {key: 'MYAPP_UPLOAD_STORE_PASSWORD', value: '***'},
+                {key: 'MYAPP_UPLOAD_KEY_PASSWORD', value: '***'},
+            ]),
+        );
+    } else {
+        steps.push(utils.createStepAssertion('Run Fastlane production', true, null, 'ANDROID', 'Running Fastlane production', null, [{key: 'VERSION', value: '1.2.3'}]));
+    }
+    steps.push(
+        utils.createStepAssertion('Archive Android sourcemaps', true, null, 'ANDROID', 'Archiving Android sourcemaps', [
+            {key: 'name', value: 'android-sourcemap'},
+            {key: 'path', value: 'android/app/build/generated/sourcemaps/react/release/*.map'},
+        ]),
+    );
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Upload Android version to Browser Stack', true, null, 'ANDROID', 'Uploading Android version to Browser Stack', null, [
+                {key: 'BROWSERSTACK', value: '***'},
+            ]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion(
+            'Warn deployers if Android production deploy failed',
+            true,
+            null,
+            'ANDROID',
+            'Warning deployers of failed production deploy',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && isProduction && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertDesktopJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setting up Node'),
+        utils.createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypting developer id certificate', null, [
+            {key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'},
+        ]),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion('Build production desktop app', true, null, 'DESKTOP', 'Building production desktop app', null, [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ]),
+        );
+    } else {
+        steps.push(
+            utils.createStepAssertion('Build staging desktop app', true, null, 'DESKTOP', 'Building staging desktop app', null, [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertIOSJobExecuted = (workflowResult, didExecute = true, isProduction = true, isSuccessful = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'IOS', 'Checking out'),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Setup Node', true, null, 'IOS', 'Setting up Node'),
+        utils.createStepAssertion('Setup Ruby', true, null, 'IOS', 'Setting up Ruby', [
+            {key: 'ruby-version', value: '2.7'},
+            {key: 'bundler-cache', value: 'true'},
+        ]),
+        utils.createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [
+            {key: 'path', value: 'ios/Pods'},
+            {key: 'key', value: 'Linux-pods-cache-'},
+            {key: 'restore-keys', value: 'Linux-pods-cache-'},
+        ]),
+        utils.createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
+        utils.createStepAssertion('Install cocoapods', true, null, 'IOS', 'Installing cocoapods', [
+            {key: 'timeout_minutes', value: '10'},
+            {key: 'max_attempts', value: '5'},
+            {key: 'command', value: 'cd ios && bundle exec pod install'},
+        ]),
+        utils.createStepAssertion('Decrypt profile', true, null, 'IOS', 'Decrypting profile', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypting certificate', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt App Store Connect API key', true, null, 'IOS', 'Decrypting App Store API key', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+    ];
+    if (!isProduction) {
+        steps.push(
+            utils.createStepAssertion('Run Fastlane', true, null, 'IOS', 'Running Fastlane', null, [
+                {key: 'APPLE_CONTACT_EMAIL', value: '***'},
+                {key: 'APPLE_CONTACT_PHONE', value: '***'},
+                {key: 'APPLE_DEMO_EMAIL', value: '***'},
+                {key: 'APPLE_DEMO_PASSWORD', value: '***'},
+            ]),
+        );
+    }
+    steps.push(
+        utils.createStepAssertion('Archive iOS sourcemaps', true, null, 'IOS', 'Archiving sourcemaps', [
+            {key: 'name', value: 'ios-sourcemap'},
+            {key: 'path', value: 'main.jsbundle.map'},
+        ]),
+    );
+    if (!isProduction) {
+        steps.push(utils.createStepAssertion('Upload iOS version to Browser Stack', true, null, 'IOS', 'Uploading version to Browser Stack', null, [{key: 'BROWSERSTACK', value: '***'}]));
+    } else {
+        steps.push(
+            utils.createStepAssertion('Set iOS version in ENV', true, null, 'IOS', 'Setting iOS version'),
+            utils.createStepAssertion('Run Fastlane for App Store release', true, null, 'IOS', 'Running Fastlane for release', null, [{key: 'VERSION', value: '1.2.3'}]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+
+    const failProdSteps = [
+        utils.createStepAssertion(
+            'Warn deployers if iOS production deploy failed',
+            true,
+            null,
+            'IOS',
+            'Warning developers of failed deploy',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+
+    failProdSteps.forEach((expectedStep) => {
+        if (didExecute && isProduction && !isSuccessful) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertWebJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'WEB', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'WEB', 'Setting up Node'),
+        utils.createStepAssertion('Setup Cloudflare CLI', true, null, 'WEB', 'Setting up Cloudflare CLI'),
+        utils.createStepAssertion('Configure AWS Credentials', true, null, 'WEB', 'Configuring AWS credentials', [
+            {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+            {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+        ]),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion('Build web for production', true, null, 'WEB', 'Building web for production'),
+            utils.createStepAssertion('Build storybook docs for production', true, null, 'WEB', 'Build storybook docs for production'),
+            utils.createStepAssertion('Deploy production to S3', true, null, 'WEB', 'Deploying production to S3'),
+            utils.createStepAssertion('Purge production Cloudflare cache', true, null, 'WEB', 'Purging production Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
+        );
+    } else {
+        steps.push(
+            utils.createStepAssertion('Build web for staging', true, null, 'WEB', 'Building web for staging'),
+            utils.createStepAssertion('Build storybook docs for staging', true, null, 'WEB', 'Build storybook docs for staging'),
+            utils.createStepAssertion('Deploy staging to S3', true, null, 'WEB', 'Deploying staging to S3'),
+            utils.createStepAssertion('Purge staging Cloudflare cache', true, null, 'WEB', 'Purging staging Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostSlackOnFailureJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Post Slack message on failure', true, null, 'POST_SLACK_FAIL', 'Posting Slack message on platform deploy failure', [{key: 'SLACK_WEBHOOK', value: '***'}]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostSlackOnSuccessJobExecuted = (workflowResult, didExecute = true, isProduction = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POST_SLACK_SUCCESS', 'Checking out'),
+        utils.createStepAssertion('Set version', true, null, 'POST_SLACK_SUCCESS', 'Setting version'),
+        utils.createStepAssertion(
+            'Announces the deploy in the #announce Slack room',
+            true,
+            null,
+            'POST_SLACK_SUCCESS',
+            'Posting message to #announce channel',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Announces the deploy in the #deployer Slack room',
+            true,
+            null,
+            'POST_SLACK_SUCCESS',
+            'Posting message to #deployer channel',
+            [{key: 'status', value: 'custom'}],
+            [
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'SLACK_WEBHOOK_URL', value: '***'},
+            ],
+        ),
+    ];
+    if (isProduction) {
+        steps.push(
+            utils.createStepAssertion(
+                'Announces the deploy in the #expensify-open-source Slack room',
+                true,
+                null,
+                'POST_SLACK_SUCCESS',
+                'Posting message to #expensify-open-source channel',
+                [{key: 'status', value: 'custom'}],
+                [
+                    {key: 'GITHUB_TOKEN', value: '***'},
+                    {key: 'SLACK_WEBHOOK_URL', value: '***'},
+                ],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostGithubCommentJobExecuted = (workflowResult, didExecute = true, isProduction = true, didDeploy = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POST_GITHUB_COMMENT', 'Checking out'),
+        utils.createStepAssertion('Setup Node', true, null, 'POST_GITHUB_COMMENT', 'Setting up Node'),
+        utils.createStepAssertion('Set version', true, null, 'POST_GITHUB_COMMENT', 'Setting version'),
+        utils.createStepAssertion('Get Release Pull Request List', true, null, 'POST_GITHUB_COMMENT', 'Getting release pull request list', [
+            {key: 'TAG', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: isProduction ? 'true' : 'false'},
+        ]),
+        utils.createStepAssertion('Comment on issues', true, null, 'POST_GITHUB_COMMENT', 'Commenting on issues', [
+            {key: 'PR_LIST', value: '[1.2.1, 1.2.2]'},
+            {key: 'IS_PRODUCTION_DEPLOY', value: isProduction ? 'true' : 'false'},
+            {key: 'DEPLOY_VERSION', value: '1.2.3'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+            {key: 'ANDROID', value: didDeploy ? 'success' : ''},
+            {key: 'DESKTOP', value: didDeploy ? 'success' : ''},
+            {key: 'IOS', value: didDeploy ? 'success' : ''},
+            {key: 'WEB', value: didDeploy ? 'success' : ''},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyActorJobExecuted,
+    assertDeployChecklistJobExecuted,
+    assertAndroidJobExecuted,
+    assertDesktopJobExecuted,
+    assertIOSJobExecuted,
+    assertWebJobExecuted,
+    assertPostSlackOnFailureJobExecuted,
+    assertPostSlackOnSuccessJobExecuted,
+    assertPostGithubCommentJobExecuted,
+};
diff --git a/workflow_tests/assertions/preDeployAssertions.js b/workflow_tests/assertions/preDeployAssertions.js
new file mode 100644
index 000000000000..90d6f9febb75
--- /dev/null
+++ b/workflow_tests/assertions/preDeployAssertions.js
@@ -0,0 +1,219 @@
+const utils = require('../utils/utils');
+
+const assertTypecheckJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run typecheck workflow', true, null, 'TYPECHECK', 'Running typecheck workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertLintJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run lint workflow', true, null, 'LINT', 'Running lint workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertTestJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Run test workflow', true, null, 'TEST', 'Running test workflow')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertIsExpensifyEmployeeJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Get merged pull request', true, null, 'IS_EXPENSIFY_EMPLOYEE', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion(
+            'Check whether the PR author is member of Expensify/expensify team',
+            true,
+            null,
+            'IS_EXPENSIFY_EMPLOYEE',
+            'Checking actors Expensify membership',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertNewContributorWelcomeMessageJobExecuted = (workflowResult, didExecute = true, isOsBotify = false, isFirstPr = false) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Checking out', [{key: 'token', value: '***'}]),
+        utils.createStepAssertion('Get merged pull request', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion(isOsBotify ? 'Get PR count for OSBotify' : 'Get PR count for Dummy Author', true, null, 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', 'Getting PR count', [
+            {key: 'GITHUB_TOKEN', value: '***'},
+        ]),
+    ];
+    const osBotifyBody =
+        '@OSBotify, Great job getting your first Expensify/App pull request over the finish line! ' +
+        ":tada:\n\nI know there's a lot of information in our " +
+        '[contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), ' +
+        'so here are some points to take note of :memo::\n\n1. Now that your first PR has been merged, you can be ' +
+        "hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one " +
+        'job at a time.\n2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) ' +
+        "testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for " +
+        'fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without ' +
+        'causing a regression.\n3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. ' +
+        'After it has been on production for 7 days without causing any regressions, then we pay out the Upwork job. ' +
+        ":moneybag:\n\nSo it might take a while before you're paid for your work, but we typically post multiple " +
+        "new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience " +
+        'contributing to this repo! :blush:';
+    const userBody =
+        '@Dummy Author, Great job getting your first Expensify/App pull request over the finish ' +
+        "line! :tada:\n\nI know there's a lot of information in our " +
+        '[contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), ' +
+        'so here are some points to take note of :memo::\n\n1. Now that your first PR has been merged, you can be ' +
+        "hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one " +
+        'job at a time.\n2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) ' +
+        "testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for " +
+        'fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without ' +
+        'causing a regression.\n3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. ' +
+        'After it has been on production for 7 days without causing any regressions, then we pay out the Upwork ' +
+        "job. :moneybag:\n\nSo it might take a while before you're paid for your work, but we typically post " +
+        "multiple new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience " +
+        'contributing to this repo! :blush:';
+    if (isFirstPr) {
+        steps.push(
+            utils.createStepAssertion(
+                isOsBotify ? "Comment on OSBotify\\'s first pull request!" : "Comment on Dummy Author\\'s first pull request!",
+                true,
+                null,
+                'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+                'Creating comment',
+                [
+                    {key: 'github_token', value: '***'},
+                    {key: 'number', value: '12345'},
+                    {key: 'body', value: isOsBotify ? osBotifyBody : userBody},
+                ],
+            ),
+        );
+    }
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertChooseDeployActionsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Get merged pull request', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
+        utils.createStepAssertion('Check if StagingDeployCash is locked', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Checking StagingDeployCash', [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion('Check if merged pull request should trigger a deploy', true, ''),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertSkipDeployJobExecuted = (workflowResult, didExecute = true) => {
+    const body = ':hand: This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.';
+    const steps = [
+        utils.createStepAssertion('Comment on deferred PR', true, null, 'SKIP_DEPLOY', 'Skipping deploy', [
+            {key: 'github_token', value: '***'},
+            {key: 'number', value: '123'},
+            {key: 'body', value: body},
+        ]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertCreateNewVersionJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Create new version', true, null, 'CREATE_NEW_VERSION', 'Creating new version')];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Run turnstyle', true, null, 'UPDATE_STAGING', 'Running turnstyle', [
+            {key: 'poll-interval-seconds', value: '10'},
+            {key: 'GITHUB_TOKEN', value: '***'},
+        ]),
+        utils.createStepAssertion('Checkout main', true, null, 'UPDATE_STAGING', 'Checkout main', [
+            {key: 'ref', value: 'main'},
+            {key: 'token', value: '***'},
+        ]),
+        utils.createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATE_STAGING', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Update staging branch from main', true, null, 'UPDATE_STAGING', 'Update staging branch from main'),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertUpdateStagingJobFailed = (workflowResult, didFail = false) => {
+    const steps = [
+        utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATE_STAGING', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}]),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didFail) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertTypecheckJobExecuted,
+    assertLintJobExecuted,
+    assertTestJobExecuted,
+    assertIsExpensifyEmployeeJobExecuted,
+    assertNewContributorWelcomeMessageJobExecuted,
+    assertChooseDeployActionsJobExecuted,
+    assertSkipDeployJobExecuted,
+    assertCreateNewVersionJobExecuted,
+    assertUpdateStagingJobExecuted,
+    assertUpdateStagingJobFailed,
+};
diff --git a/workflow_tests/assertions/reviewerChecklistAssertions.js b/workflow_tests/assertions/reviewerChecklistAssertions.js
new file mode 100644
index 000000000000..6154b1cd28ca
--- /dev/null
+++ b/workflow_tests/assertions/reviewerChecklistAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertChecklistJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('reviewerChecklist.js', true, null, 'CHECKLIST', 'reviewerChecklist.js', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertChecklistJobExecuted,
+};
diff --git a/workflow_tests/assertions/testAssertions.js b/workflow_tests/assertions/testAssertions.js
new file mode 100644
index 000000000000..cee379ad5903
--- /dev/null
+++ b/workflow_tests/assertions/testAssertions.js
@@ -0,0 +1,58 @@
+const utils = require('../utils/utils');
+
+const assertJestJobExecuted = (workflowResult, didExecute = true, timesExecuted = 3) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'JEST', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'JEST', 'Setup Node', [], []),
+        utils.createStepAssertion('Get number of CPU cores', true, null, 'JEST', 'Get number of CPU cores', [], []),
+        utils.createStepAssertion(
+            'Cache Jest cache',
+            true,
+            null,
+            'JEST',
+            'Cache Jest cache',
+            [
+                {key: 'path', value: '.jest-cache'},
+                {key: 'key', value: 'Linux-jest'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Jest tests', true, null, 'JEST', 'Jest tests', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            let cnt = 0;
+            workflowResult.forEach((executedStep) => {
+                if (executedStep.name !== expectedStep.name || executedStep.output !== expectedStep.output || executedStep.status !== expectedStep.status) {
+                    return;
+                }
+                cnt += 1;
+            });
+            expect(cnt).toEqual(timesExecuted);
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertShellTestsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'SHELLTESTS', 'Checkout', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'SHELLTESTS', 'Setup Node', [], []),
+        utils.createStepAssertion('Test CI git logic', true, null, 'SHELLTESTS', 'Test CI git logic', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertJestJobExecuted,
+    assertShellTestsJobExecuted,
+};
diff --git a/workflow_tests/assertions/testBuildAssertions.js b/workflow_tests/assertions/testBuildAssertions.js
new file mode 100644
index 000000000000..a4f7a46259ad
--- /dev/null
+++ b/workflow_tests/assertions/testBuildAssertions.js
@@ -0,0 +1,413 @@
+const utils = require('../utils/utils');
+
+const assertValidateActorJobExecuted = (workflowResult, pullRequestNumber = '1234', didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Is Expensify employee', true, null, 'VALIDATEACTOR', 'Is Expensify employee', [], [{key: 'GITHUB_TOKEN', value: '***'}]),
+        utils.createStepAssertion(
+            'Set HAS_READY_TO_BUILD_LABEL flag',
+            true,
+            null,
+            'VALIDATEACTOR',
+            'Set HAS_READY_TO_BUILD_LABEL flag',
+            [],
+            [
+                {key: 'PULL_REQUEST_NUMBER', value: pullRequestNumber},
+                {key: 'GITHUB_TOKEN', value: '***'},
+            ],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertGetBranchRefJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'GETBRANCHREF', 'Checkout', [], []),
+        utils.createStepAssertion(
+            'Check if pull request number is correct',
+            true,
+            null,
+            'GETBRANCHREF',
+            'Check if pull request number is correct',
+            [],
+            [{key: 'GITHUB_TOKEN', value: '***'}],
+        ),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertAndroidJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'ANDROID', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion(
+            'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+            true,
+            null,
+            'ANDROID',
+            'Creating .env.adhoc file based on staging',
+            [],
+            [],
+        ),
+        utils.createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setup Node', [], []),
+        utils.createStepAssertion(
+            'Setup Ruby',
+            true,
+            null,
+            'ANDROID',
+            'Setup Ruby',
+            [
+                {key: 'ruby-version', value: '2.7'},
+                {key: 'bundler-cache', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypt keystore', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypt json key', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'ANDROID',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
+        utils.createStepAssertion(
+            'Run Fastlane beta test',
+            true,
+            null,
+            'ANDROID',
+            'Run Fastlane beta test',
+            [],
+            [
+                {key: 'S3_ACCESS_KEY', value: '***'},
+                {key: 'S3_SECRET_ACCESS_KEY', value: '***'},
+                {key: 'S3_BUCKET', value: 'ad-hoc-expensify-cash'},
+                {key: 'S3_REGION', value: 'us-east-1'},
+                {key: 'MYAPP_UPLOAD_STORE_PASSWORD', value: '***'},
+                {key: 'MYAPP_UPLOAD_KEY_PASSWORD', value: '***'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Upload Artifact',
+            true,
+            null,
+            'ANDROID',
+            'Upload Artifact',
+            [
+                {key: 'name', value: 'android'},
+                {key: 'path', value: './android_paths.json'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertIOSJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'IOS', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
+        utils.createStepAssertion('Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it', true, null, 'IOS', 'Creating .env.adhoc file based on staging', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'IOS', 'Setup Node', [], []),
+        utils.createStepAssertion('Setup XCode', true, null, 'IOS', 'Setup XCode', [], []),
+        utils.createStepAssertion(
+            'Setup Ruby',
+            true,
+            null,
+            'IOS',
+            'Setup Ruby',
+            [
+                {key: 'ruby-version', value: '2.7'},
+                {key: 'bundler-cache', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Cache Pod dependencies', true, null, 'IOS', 'Cache Pod dependencies', [
+            {key: 'path', value: 'ios/Pods'},
+            {key: 'key', value: 'Linux-pods-cache-'},
+            {key: 'restore-keys', value: 'Linux-pods-cache-'},
+        ]),
+        utils.createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
+        utils.createStepAssertion(
+            'Install cocoapods',
+            true,
+            null,
+            'IOS',
+            'Install cocoapods',
+            [
+                {key: 'timeout_minutes', value: '10'},
+                {key: 'max_attempts', value: '5'},
+                {key: 'command', value: 'cd ios && bundle exec pod install'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Decrypt profile', true, null, 'IOS', 'Decrypt profile', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypt certificate', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'IOS',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Run Fastlane',
+            true,
+            null,
+            'IOS',
+            'Run Fastlane',
+            [],
+            [
+                {key: 'S3_ACCESS_KEY', value: '***'},
+                {key: 'S3_SECRET_ACCESS_KEY', value: '***'},
+                {key: 'S3_BUCKET', value: 'ad-hoc-expensify-cash'},
+                {key: 'S3_REGION', value: 'us-east-1'},
+            ],
+        ),
+        utils.createStepAssertion(
+            'Upload Artifact',
+            true,
+            null,
+            'IOS',
+            'Upload Artifact',
+            [
+                {key: 'name', value: 'ios'},
+                {key: 'path', value: './ios_paths.json'},
+            ],
+            [],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertDesktopJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion(
+            'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+            true,
+            null,
+            'DESKTOP',
+            'Creating .env.adhoc file based on staging',
+            [],
+            [],
+        ),
+        utils.createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setup Node', [], []),
+        utils.createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypt Developer ID Certificate', [], [{key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'}]),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'DESKTOP',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Build desktop app for testing',
+            true,
+            null,
+            'DESKTOP',
+            'Build desktop app for testing',
+            [],
+            [
+                {key: 'CSC_LINK', value: '***'},
+                {key: 'CSC_KEY_PASSWORD', value: '***'},
+                {key: 'APPLE_ID', value: '***'},
+                {key: 'APPLE_APP_SPECIFIC_PASSWORD', value: '***'},
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+        ),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+const assertWebJobExecuted = (workflowResult, ref = '', didExecute = true, failsAt = -1) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'WEB', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it', true, null, 'WEB', 'Creating .env.adhoc file based on staging', [], []),
+        utils.createStepAssertion('Setup Node', true, null, 'WEB', 'Setup Node', [], []),
+        utils.createStepAssertion(
+            'Configure AWS Credentials',
+            true,
+            null,
+            'WEB',
+            'Configure AWS Credentials',
+            [
+                {key: 'AWS_ACCESS_KEY_ID', value: '***'},
+                {key: 'AWS_SECRET_ACCESS_KEY', value: '***'},
+            ],
+            [],
+        ),
+        utils.createStepAssertion('Build web for testing', true, null, 'WEB', 'Build web for testing', [], []),
+        utils.createStepAssertion('Build docs', true, null, 'WEB', 'Build docs', [], []),
+        utils.createStepAssertion('Deploy to S3 for internal testing', true, null, 'WEB', 'Deploy to S3 for internal testing', [], []),
+    ];
+
+    steps.forEach((expectedStep, i) => {
+        if (didExecute) {
+            if (failsAt === -1 || i < failsAt) {
+                // either whole job is successful, or steps up to this point are successful
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else if (i === failsAt) {
+                // this is the failing step
+                steps[i].status = 1;
+                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+            } else {
+                // steps after failed one do not execute
+                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+            }
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+const assertPostGithubCommentJobExecuted = (
+    workflowResult,
+    ref = '',
+    pullRequestNumber = '1234',
+    didExecute = true,
+    androidStatus = 'success',
+    iOSStatus = 'success',
+    desktopStatus = 'success',
+    webStatus = 'success',
+) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'POSTGITHUBCOMMENT', 'Checkout', [{key: 'ref', value: ref}], []),
+        utils.createStepAssertion('Download Artifact', true, null, 'POSTGITHUBCOMMENT', 'Download Artifact', [], []),
+    ];
+    if (androidStatus === 'success') {
+        steps.push(utils.createStepAssertion('Read JSONs with android paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with android paths', [], []));
+    }
+    if (iOSStatus === 'success') {
+        steps.push(utils.createStepAssertion('Read JSONs with iOS paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with iOS paths', [], []));
+    }
+    steps.push(
+        utils.createStepAssertion(
+            'maintain-comment',
+            true,
+            null,
+            'POSTGITHUBCOMMENT',
+            'maintain-comment',
+            [
+                {key: 'token', value: '***'},
+                {key: 'body-include', value: 'Use the links below to test this build in android and iOS. Happy testing!'},
+                {key: 'number', value: pullRequestNumber},
+                {key: 'delete', value: true},
+            ],
+            [],
+        ),
+        utils.createStepAssertion(
+            'Publish links to apps for download',
+            true,
+            null,
+            'POSTGITHUBCOMMENT',
+            'Publish links to apps for download',
+            [
+                {key: 'PR_NUMBER', value: pullRequestNumber},
+                {key: 'GITHUB_TOKEN', value: '***'},
+                {key: 'ANDROID', value: androidStatus},
+                {key: 'DESKTOP', value: desktopStatus},
+                {key: 'IOS', value: iOSStatus},
+                {key: 'WEB', value: webStatus},
+                {key: 'ANDROID_LINK', value: androidStatus === 'success' ? 'http://dummy.android.link' : ''},
+                {key: 'DESKTOP_LINK', value: `https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${pullRequestNumber}/NewExpensify.dmg`},
+                {key: 'IOS_LINK', value: iOSStatus === 'success' ? 'http://dummy.ios.link' : ''},
+                {key: 'WEB_LINK', value: `https://${pullRequestNumber}.pr-testing.expensify.com`},
+            ],
+            [],
+        ),
+    );
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertValidateActorJobExecuted,
+    assertGetBranchRefJobExecuted,
+    assertAndroidJobExecuted,
+    assertIOSJobExecuted,
+    assertDesktopJobExecuted,
+    assertWebJobExecuted,
+    assertPostGithubCommentJobExecuted,
+};
diff --git a/workflow_tests/assertions/validateGithubActionsAssertions.js b/workflow_tests/assertions/validateGithubActionsAssertions.js
new file mode 100644
index 000000000000..fb5f58d2b5ed
--- /dev/null
+++ b/workflow_tests/assertions/validateGithubActionsAssertions.js
@@ -0,0 +1,22 @@
+const utils = require('../utils/utils');
+
+const assertVerifyJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
+        utils.createStepAssertion('Verify Javascript Action Builds', true, null, 'VERIFY', 'Verify Javascript Action Builds', [], []),
+        utils.createStepAssertion('Validate actions and workflows', true, null, 'VERIFY', 'Validate actions and workflows', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyJobExecuted,
+};
diff --git a/workflow_tests/assertions/verifyPodfileAssertions.js b/workflow_tests/assertions/verifyPodfileAssertions.js
new file mode 100644
index 000000000000..e0cc50570fec
--- /dev/null
+++ b/workflow_tests/assertions/verifyPodfileAssertions.js
@@ -0,0 +1,21 @@
+const utils = require('../utils/utils');
+
+const assertVerifyJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [
+        utils.createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
+        utils.createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
+        utils.createStepAssertion('Verify podfile', true, null, 'VERIFY', 'Verify podfile', [], []),
+    ];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifyJobExecuted,
+};
diff --git a/workflow_tests/assertions/verifySignedCommitsAssertions.js b/workflow_tests/assertions/verifySignedCommitsAssertions.js
new file mode 100644
index 000000000000..458bc684363f
--- /dev/null
+++ b/workflow_tests/assertions/verifySignedCommitsAssertions.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+const assertVerifySignedCommitsJobExecuted = (workflowResult, didExecute = true) => {
+    const steps = [utils.createStepAssertion('Verify signed commits', true, null, 'VERIFYSIGNEDCOMMITS', 'Verify signed commits', [{key: 'GITHUB_TOKEN', value: '***'}], [])];
+
+    steps.forEach((expectedStep) => {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    });
+};
+
+module.exports = {
+    assertVerifySignedCommitsJobExecuted,
+};
diff --git a/workflow_tests/authorChecklist.test.js b/workflow_tests/authorChecklist.test.js
new file mode 100644
index 000000000000..64a25c8fe1b8
--- /dev/null
+++ b/workflow_tests/authorChecklist.test.js
@@ -0,0 +1,181 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/authorChecklistAssertions');
+const mocks = require('./mocks/authorChecklistMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'authorChecklist.yml'),
+        dest: '.github/workflows/authorChecklist.yml',
+    },
+];
+
+describe('test workflow authorChecklist', () => {
+    const githubToken = 'dummy_github_token';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testAuthorChecklistWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            it('executes workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            it('does not execute workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request edited', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'edited',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            it('executes workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            it('does not execute workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request reopened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'reopened',
+        };
+        describe('actor is not OSBotify', () => {
+            const actor = 'Dummy Author';
+            it('executes workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            it('does not execute workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/cherryPick.test.js b/workflow_tests/cherryPick.test.js
new file mode 100644
index 000000000000..592170a7c64e
--- /dev/null
+++ b/workflow_tests/cherryPick.test.js
@@ -0,0 +1,391 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/cherryPickAssertions');
+const mocks = require('./mocks/cherryPickMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'cherryPick.yml'),
+        dest: '.github/workflows/cherryPick.yml',
+    },
+];
+
+describe('test workflow cherryPick', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testCherryPickWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('manual workflow dispatch', () => {
+        const event = 'workflow_dispatch';
+        describe('actor is not deployer', () => {
+            const actor = 'Dummy Author';
+            it('workflow ends after validate job', async () => {
+                const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    event,
+                    null,
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                    'dummy_github_token',
+                    null,
+                    {
+                        PULL_REQUEST_NUMBER: '1234',
+                    },
+                );
+                const testMockSteps = {
+                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+                    cherryPick: mocks.getCherryPickMockSteps(true, false),
+                };
+                const testMockJobs = {
+                    createNewVersion: {
+                        steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertCherryPickJobExecuted(result, actor, '1234', false);
+            });
+        });
+        describe('actor is OSBotify', () => {
+            const actor = 'OSBotify';
+            const mergeConflicts = false;
+            const versionsMatch = true;
+            it('behaviour is the same as with actor being the deployer', async () => {
+                const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+                    cherryPick: mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts),
+                };
+                const testMockJobs = {
+                    createNewVersion: {
+                        steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                act = utils.setUpActParams(
+                    act,
+                    event,
+                    null,
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                    'dummy_github_token',
+                    null,
+                    {
+                        PULL_REQUEST_NUMBER: '1234',
+                    },
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+                assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+            });
+        });
+        describe('actor is a deployer', () => {
+            const actor = 'Dummy Author';
+            describe('no merge conflicts', () => {
+                const mergeConflicts = false;
+                describe('version match', () => {
+                    const versionsMatch = true;
+                    it('workflow executes, PR approved and merged automatically', async () => {
+                        const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+                    });
+                });
+                describe('version does not match', () => {
+                    const versionsMatch = false;
+                    it('workflow executes, PR auto-assigned and commented, approved and merged automatically', async () => {
+                        const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true);
+                    });
+                });
+            });
+            describe('merge conflicts', () => {
+                const mergeConflicts = true;
+                describe('version match', () => {
+                    const versionsMatch = true;
+                    it('workflow executes, PR auto-assigned and commented, not merged automatically', async () => {
+                        const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true, true);
+                    });
+                });
+                describe('version does not match', () => {
+                    const versionsMatch = false;
+                    it('workflow executes, PR auto-assigned and commented, not merged automatically', async () => {
+                        const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        const testMockSteps = {
+                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                        };
+                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
+                        const testMockJobs = {
+                            createNewVersion: {
+                                steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        act = utils.setUpActParams(
+                            act,
+                            event,
+                            null,
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                            'dummy_github_token',
+                            null,
+                            {
+                                PULL_REQUEST_NUMBER: '1234',
+                            },
+                        );
+                        const result = await act.runEvent(event, {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                            mockSteps: testMockSteps,
+                            actor,
+                            logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+
+                        assertions.assertValidateActorJobExecuted(result);
+                        assertions.assertCreateNewVersionJobExecuted(result);
+                        assertions.assertCherryPickJobExecuted(result, actor, '1234', true, true);
+                    });
+                });
+            });
+        });
+    });
+    describe('automatic trigger', () => {
+        const event = 'pull_request';
+        it('workflow does not execute', async () => {
+            const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                event,
+                null,
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                },
+                'dummy_github_token',
+                null,
+                {
+                    PULL_REQUEST_NUMBER: '1234',
+                },
+            );
+            const testMockSteps = {
+                validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+                cherryPick: mocks.getCherryPickMockSteps(true, false),
+            };
+            const testMockJobs = {
+                createNewVersion: {
+                    steps: mocks.CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'cherryPick.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Author',
+                logFile: utils.getLogFilePath('cherryPick', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+
+            assertions.assertValidateActorJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertCherryPickJobExecuted(result, 'Dummy Author', '1234', false);
+        });
+    });
+});
diff --git a/workflow_tests/cla.test.js b/workflow_tests/cla.test.js
new file mode 100644
index 000000000000..301aa7587f53
--- /dev/null
+++ b/workflow_tests/cla.test.js
@@ -0,0 +1,196 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/claAssertions');
+const mocks = require('./mocks/claMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'cla.yml'),
+        dest: '.github/workflows/cla.yml',
+    },
+];
+
+describe('test workflow cla', () => {
+    const secrets = {
+        CLA_BOTIFY_TOKEN: 'dummy_cla_botify_token',
+    };
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Author';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testClaWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is issue_comment', () => {
+        const event = 'issue_comment';
+        describe('no regex matches', () => {
+            const commentBody = 'Comment body';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            it('workflow executes, CLA assistant step not run', async () => {
+                const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, false);
+            });
+        });
+        describe('check regex matches', () => {
+            const commentBody = 'I have read the CLA Document and I hereby sign the CLA';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            it('workflow executes, CLA assistant step run', async () => {
+                const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__CHECK_MATCH__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, true);
+            });
+        });
+        describe('re-check regex matches', () => {
+            const commentBody = 'recheck';
+            const eventData = {
+                action: 'created',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+                comment: {
+                    body: commentBody,
+                },
+            };
+            it('workflow executes, CLA assistant step run', async () => {
+                const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, commentBody, `${repoPath}/remote/origin`, true, true);
+            });
+        });
+    });
+    describe('event is pull_request_target', () => {
+        const event = 'pull_request_target';
+        describe("no regex matches - there's no comment", () => {
+            const eventData = {
+                action: 'opened',
+                issue: {
+                    pull_request: {
+                        number: 1234,
+                    },
+                },
+            };
+            it('workflow executes, CLA assistant step still run', async () => {
+                const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+                const testMockSteps = {
+                    CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+                });
+
+                assertions.assertCLAJobExecuted(result, '', `${repoPath}/remote/origin`, true, true);
+            });
+        });
+    });
+    describe('different event', () => {
+        const event = 'push';
+        it('workflow does not execute', async () => {
+            const eventData = {
+                ref: 'main',
+            };
+            const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
+            const testMockSteps = {
+                CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
+            });
+
+            assertions.assertCLAJobExecuted(result, '', `${repoPath}/remote/origin`, false);
+        });
+    });
+});
diff --git a/workflow_tests/createNewVersion.test.js b/workflow_tests/createNewVersion.test.js
new file mode 100644
index 000000000000..259e06450325
--- /dev/null
+++ b/workflow_tests/createNewVersion.test.js
@@ -0,0 +1,166 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/createNewVersionAssertions');
+const mocks = require('./mocks/createNewVersionMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000); // 90 sec
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'createNewVersion.yml'),
+        dest: '.github/workflows/createNewVersion.yml',
+    },
+];
+
+describe('test workflow createNewVersion', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testCreateNewVersionWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const inputs = {
+            SEMVER_LEVEL: 'BUILD',
+        };
+        const secrets = {
+            LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+            SLACK_WEBHOOK: 'dummy_webhook',
+        };
+        const githubToken = 'dummy_github_token';
+
+        describe('actor is admin', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS;
+            it('executes full workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+            });
+        });
+
+        describe('actor is writer', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS;
+            it('executes full workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result);
+            });
+        });
+
+        describe('actor is reader', () => {
+            const validateActorMockSteps = mocks.CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS;
+            it('stops after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: validateActorMockSteps,
+                    createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, 'BUILD', false);
+            });
+        });
+
+        describe('one step fails', () => {
+            it('announces failure on Slack', async () => {
+                const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+                    createNewVersion: utils.deepCopy(mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS),
+                };
+                testMockSteps.createNewVersion[5] = utils.createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], [], [], [], false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+                });
+                assertions.assertValidateActorJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, 'BUILD', true, false);
+            });
+        });
+
+        it('chooses source branch depending on the SEMVER_LEVEL', async () => {
+            const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, {SEMVER_LEVEL: 'MAJOR'});
+            act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+                createNewVersion: mocks.CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Author',
+                logFile: utils.getLogFilePath('createNewVersion', expect.getState().currentTestName),
+            });
+            assertions.assertValidateActorJobExecuted(result);
+            assertions.assertCreateNewVersionJobExecuted(result, 'MAJOR');
+        });
+    });
+});
diff --git a/workflow_tests/deploy.test.js b/workflow_tests/deploy.test.js
new file mode 100644
index 000000000000..a2ccdebc0b31
--- /dev/null
+++ b/workflow_tests/deploy.test.js
@@ -0,0 +1,183 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/deployAssertions');
+const mocks = require('./mocks/deployMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'deploy.yml'),
+        dest: '.github/workflows/deploy.yml',
+    },
+];
+
+describe('test workflow deploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('push', () => {
+        it('to main - nothing triggered', async () => {
+            const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/main',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result, false);
+            assertions.assertDeployProductionJobExecuted(result, false);
+        });
+
+        it('to staging - deployStaging triggered', async () => {
+            const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/staging',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result);
+            assertions.assertDeployProductionJobExecuted(result, false);
+        });
+
+        it('to production - deployProduction triggered', async () => {
+            const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {
+                    ref: 'refs/heads/production',
+                },
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+                deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+            });
+            assertions.assertDeployStagingJobExecuted(result, false);
+            assertions.assertDeployProductionJobExecuted(result);
+        });
+    });
+
+    it('different event than push - workflow does not execute', async () => {
+        const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
+        const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
+        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        const testMockSteps = {
+            deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
+            deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
+        };
+
+        // pull_request
+        act = utils.setUpActParams(
+            act,
+            'pull_request',
+            {head: {ref: 'main'}},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        let result = await act.runEvent('pull_request', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Author',
+            logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+        });
+        assertions.assertDeployStagingJobExecuted(result, false);
+        assertions.assertDeployProductionJobExecuted(result, false);
+
+        // workflow_dispatch
+        act = utils.setUpActParams(
+            act,
+            'workflow_dispatch',
+            {},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        result = await act.runEvent('workflow_dispatch', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'deploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Author',
+            logFile: utils.getLogFilePath('deploy', expect.getState().currentTestName),
+        });
+        assertions.assertDeployStagingJobExecuted(result, false);
+        assertions.assertDeployProductionJobExecuted(result, false);
+    });
+});
diff --git a/workflow_tests/deployBlocker.test.js b/workflow_tests/deployBlocker.test.js
new file mode 100644
index 000000000000..1cfca11c90f5
--- /dev/null
+++ b/workflow_tests/deployBlocker.test.js
@@ -0,0 +1,135 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/deployBlockerAssertions');
+const mocks = require('./mocks/deployBlockerMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'deployBlocker.yml'),
+        dest: '.github/workflows/deployBlocker.yml',
+    },
+];
+
+describe('test workflow deployBlocker', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Author';
+    const secrets = {
+        OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+        SLACK_WEBHOOK: 'dummy_slack_webhook',
+    };
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testDeployBlockerWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue labeled', () => {
+        const event = 'issues';
+        const eventOptions = {
+            action: 'labeled',
+            label: {
+                name: 'DeployBlockerCash',
+            },
+            issue: {
+                title: 'Labeled issue title',
+                number: '1234',
+                html_url: 'http://issue.html.url',
+            },
+        };
+        describe('label is DeployBlockerCash', () => {
+            const testEventOptions = utils.deepCopy(eventOptions);
+            testEventOptions.label = {name: 'DeployBlockerCash'};
+            it('runs the workflow and announces success on Slack', async () => {
+                const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                const testMockSteps = {
+                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                });
+
+                assertions.assertDeployBlockerJobExecuted(result, 'Labeled issue title', '1234');
+            });
+            describe('one step fails', () => {
+                it('announces failure on Slack', async () => {
+                    const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
+                    const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
+                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                    const testMockSteps = {
+                        deployBlocker: utils.deepCopy(mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS),
+                    };
+                    testMockSteps.deployBlocker[2] = utils.createMockStep(
+                        'Update StagingDeployCash with new deploy blocker',
+                        'Update StagingDeployCash with new deploy blocker',
+                        'DEPLOYBLOCKER',
+                        ['GITHUB_TOKEN'],
+                        [],
+                        {},
+                        {},
+                        false,
+                    );
+                    const result = await act.runEvent(event, {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                        mockSteps: testMockSteps,
+                        actor,
+                        logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                    });
+
+                    assertions.assertDeployBlockerJobExecuted(result, 'Labeled issue title', '1234', true, false);
+                });
+            });
+        });
+        describe('label is different', () => {
+            const testEventOptions = utils.deepCopy(eventOptions);
+            testEventOptions.label = {name: 'Different Label'};
+            it('does not run workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
+                const testMockSteps = {
+                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
+                });
+
+                assertions.assertDeployBlockerJobExecuted(result, '', '', false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/finishReleaseCycle.test.js b/workflow_tests/finishReleaseCycle.test.js
new file mode 100644
index 000000000000..7c17ca8d4122
--- /dev/null
+++ b/workflow_tests/finishReleaseCycle.test.js
@@ -0,0 +1,247 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/finishReleaseCycleAssertions');
+const mocks = require('./mocks/finishReleaseCycleMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'finishReleaseCycle.yml'),
+        dest: '.github/workflows/finishReleaseCycle.yml',
+    },
+];
+
+describe('test workflow finishReleaseCycle', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testFinishReleaseCycleWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue closed', () => {
+        describe('issue has StagingDeployCash', () => {
+            describe('actor is a team member', () => {
+                describe('no deploy blockers', () => {
+                    it('production updated, new version created', async () => {
+                        const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'closed',
+                                type: 'closed',
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                    number: '1234',
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        const testMockSteps = {
+                            validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                            updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                            updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                        };
+                        const testMockJobs = {
+                            createNewPatchVersion: {
+                                steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+                        assertions.assertValidateJobExecuted(result, '1234');
+                        assertions.assertUpdateProductionJobExecuted(result);
+                        assertions.assertCreateNewPatchVersionJobExecuted(result);
+                        assertions.assertUpdateStagingJobExecuted(result);
+                    });
+                });
+                describe('deploy blockers', () => {
+                    it('production not updated, new version not created, issue reopened', async () => {
+                        const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'closed',
+                                type: 'closed',
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                    number: '1234',
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        const testMockSteps = {
+                            validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+                            updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                            updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                        };
+                        const testMockJobs = {
+                            createNewPatchVersion: {
+                                steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                                outputs: {
+                                    // eslint-disable-next-line no-template-curly-in-string
+                                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                                },
+                                runsOn: 'ubuntu-latest',
+                            },
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                            mockJobs: testMockJobs,
+                        });
+                        assertions.assertValidateJobExecuted(result, '1234', true, true, true);
+                        assertions.assertUpdateProductionJobExecuted(result, false);
+                        assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                        assertions.assertUpdateStagingJobExecuted(result, false);
+                    });
+                });
+            });
+            describe('actor is not a team member', () => {
+                it('production not updated, new version not created, issue reopened', async () => {
+                    const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
+                    const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
+                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    act = utils.setUpActParams(
+                        act,
+                        'issues',
+                        {
+                            action: 'closed',
+                            type: 'closed',
+                            issue: {
+                                labels: [{name: 'StagingDeployCash'}],
+                                number: '1234',
+                            },
+                        },
+                        {
+                            OS_BOTIFY_TOKEN: 'dummy_token',
+                            LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                            SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        },
+                    );
+                    const testMockSteps = {
+                        validate: mocks.FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                        updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                        updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                    };
+                    const testMockJobs = {
+                        createNewPatchVersion: {
+                            steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                            outputs: {
+                                // eslint-disable-next-line no-template-curly-in-string
+                                NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                            },
+                            runsOn: 'ubuntu-latest',
+                        },
+                    };
+                    const result = await act.runEvent('issues', {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                        mockSteps: testMockSteps,
+                        actor: 'Dummy Author',
+                        logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                        mockJobs: testMockJobs,
+                    });
+                    assertions.assertValidateJobExecuted(result, '1234', true, false, false);
+                    assertions.assertUpdateProductionJobExecuted(result, false);
+                    assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                    assertions.assertUpdateStagingJobExecuted(result, false);
+                });
+            });
+        });
+        describe('issue does not have StagingDeployCash', () => {
+            it('validate job not run', async () => {
+                const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'issues',
+                    {
+                        action: 'closed',
+                        type: 'closed',
+                        issue: {
+                            labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                            number: '1234',
+                        },
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                );
+                const testMockSteps = {
+                    validate: mocks.FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+                    updateProduction: mocks.FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+                    updateStaging: mocks.FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+                };
+                const testMockJobs = {
+                    createNewPatchVersion: {
+                        steps: mocks.FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('issues', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('finishReleaseCycle', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertValidateJobExecuted(result, '1234', false);
+                assertions.assertUpdateProductionJobExecuted(result, false);
+                assertions.assertCreateNewPatchVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/jest.config.js b/workflow_tests/jest.config.js
new file mode 100644
index 000000000000..c8a4534764e3
--- /dev/null
+++ b/workflow_tests/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+    verbose: true,
+    transform: {
+        '^.+\\.jsx?$': 'babel-jest',
+    },
+    clearMocks: true,
+    resetMocks: true,
+};
diff --git a/workflow_tests/lint.test.js b/workflow_tests/lint.test.js
new file mode 100644
index 000000000000..bc51f31b657c
--- /dev/null
+++ b/workflow_tests/lint.test.js
@@ -0,0 +1,154 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/lintAssertions');
+const mocks = require('./mocks/lintMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'lint.yml'),
+        dest: '.github/workflows/lint.yml',
+    },
+];
+
+describe('test workflow lint', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testLintWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const eventOptions = {};
+        it('runs the lint', async () => {
+            const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                lint: mocks.LINT__LINT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+            });
+
+            assertions.assertLintJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            const testActor = 'OSBotify';
+            it('runs the lint', async () => {
+                const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor: testActor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+        });
+    });
+    describe('event is pull_request', () => {
+        const event = 'pull_request';
+        describe('pull_request is opened', () => {
+            const eventOptions = {
+                action: 'opened',
+            };
+            it('runs the lint', async () => {
+                const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+            describe('actor is OSBotify', () => {
+                const testActor = 'OSBotify';
+                it('does not run the lint', async () => {
+                    const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
+                    const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
+                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                    const testMockSteps = {
+                        lint: mocks.LINT__LINT__STEP_MOCKS,
+                    };
+                    const result = await act.runEvent(event, {
+                        workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                        mockSteps: testMockSteps,
+                        actor: testActor,
+                        logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                    });
+
+                    assertions.assertLintJobExecuted(result, false);
+                });
+            });
+        });
+        describe('pull_request is synchronized', () => {
+            const eventOptions = {
+                action: 'synchronize',
+            };
+            it('runs the lint', async () => {
+                const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    lint: mocks.LINT__LINT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'lint.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('lint', expect.getState().currentTestName),
+                });
+
+                assertions.assertLintJobExecuted(result);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/lockDeploys.test.js b/workflow_tests/lockDeploys.test.js
new file mode 100644
index 000000000000..a57ed8847fd3
--- /dev/null
+++ b/workflow_tests/lockDeploys.test.js
@@ -0,0 +1,458 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/lockDeploysAssertions');
+const mocks = require('./mocks/lockDeploysMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'lockDeploys.yml'),
+        dest: '.github/workflows/lockDeploys.yml',
+    },
+];
+
+describe('test workflow lockDeploys', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testLockDeploysWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('issue labeled', () => {
+        describe('label is LockCashDeploys', () => {
+            describe('issue has StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    it('job triggered, comment left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result);
+                    });
+
+                    it('one step fails, comment not left in StagingDeployCash, announced failure in Slack', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        testMockSteps.lockStagingDeploys[1] = utils.createMockStep(
+                            'Wait for staging deploys to finish',
+                            'Waiting for staging deploys to finish',
+                            'LOCKSTAGINGDEPLOYS',
+                            ['GITHUB_TOKEN'],
+                            [],
+                            null,
+                            null,
+                            false,
+                        );
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobFailedAfterFirstStep(result);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+
+            describe('issue does not have StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: '🔐 LockCashDeploys 🔐',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+        });
+
+        describe('label is not LockCashDeploys', () => {
+            describe('issue has StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some different label',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some different label',
+                                },
+                                issue: {
+                                    labels: [{name: 'StagingDeployCash'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+
+            describe('issue does not have StagingDeployCash', () => {
+                describe('actor is not OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some other label',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'Dummy Author',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+
+                describe('actor is OSBotify', () => {
+                    it('job not triggered, comment not left in StagingDeployCash', async () => {
+                        const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
+                        const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
+                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        act = utils.setUpActParams(
+                            act,
+                            'issues',
+                            {
+                                action: 'labeled',
+                                type: 'labeled',
+                                label: {
+                                    name: 'Some other label',
+                                },
+                                issue: {
+                                    labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
+                                },
+                            },
+                            {
+                                OS_BOTIFY_TOKEN: 'dummy_token',
+                                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                            },
+                        );
+                        act = utils.setJobRunners(
+                            act,
+                            {
+                                lockStagingDeploys: 'ubuntu-latest',
+                            },
+                            workflowPath,
+                        );
+                        const testMockSteps = {
+                            lockStagingDeploys: mocks.LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+                        };
+                        const result = await act.runEvent('issues', {
+                            workflowFile: path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml'),
+                            mockSteps: testMockSteps,
+                            actor: 'OSBotify',
+                            logFile: utils.getLogFilePath('lockDeploys', expect.getState().currentTestName),
+                        });
+
+                        assertions.assertlockStagingDeploysJobExecuted(result, false);
+                    });
+                });
+            });
+        });
+    });
+});
diff --git a/workflow_tests/mocks/authorChecklistMocks.js b/workflow_tests/mocks/authorChecklistMocks.js
new file mode 100644
index 000000000000..db211f5ec1e6
--- /dev/null
+++ b/workflow_tests/mocks/authorChecklistMocks.js
@@ -0,0 +1,9 @@
+const utils = require('../utils/utils');
+
+// checklist
+const AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK = utils.createMockStep('authorChecklist.js', 'Running authorChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS = [AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK];
+
+module.exports = {
+    AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/cherryPickMocks.js b/workflow_tests/mocks/cherryPickMocks.js
new file mode 100644
index 000000000000..778e6fd48ded
--- /dev/null
+++ b/workflow_tests/mocks/cherryPickMocks.js
@@ -0,0 +1,114 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if user is a deployer',
+    'VALIDATEACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if user is a deployer',
+    'VALIDATEACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+const CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK];
+const CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS = [CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_FALSE__STEP_MOCK];
+
+// createnewversion
+const CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATENEWVERSION',
+    [],
+    [],
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const CHERRYPICK__CREATENEWVERSION__STEP_MOCKS = [CHERRYPICK__CREATENEWVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+
+// cherrypick
+const CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'CHERRYPICK', ['ref', 'token'], []);
+const CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep('Set up git for OSBotify', 'Setting up git for OSBotify', 'CHERRYPICK', ['GPG_PASSPHRASE'], []);
+const CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK = utils.createMockStep('Get previous app version', 'Get previous app version', 'CHERRYPICK', ['SEMVER_LEVEL']);
+const CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK = utils.createMockStep('Fetch history of relevant refs', 'Fetch history of relevant refs', 'CHERRYPICK');
+const CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK = utils.createMockStep('Get version bump commit', 'Get version bump commit', 'CHERRYPICK', [], [], {
+    VERSION_BUMP_SHA: 'version_bump_sha',
+});
+const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK = utils.createMockStep(
+    'Get merge commit for pull request to CP',
+    'Get merge commit for pull request to CP',
+    'CHERRYPICK',
+    ['GITHUB_TOKEN', 'USER', 'PULL_REQUEST_NUMBER'],
+    [],
+    {MERGE_ACTOR: '@dummyauthor'},
+);
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the version-bump to staging',
+    'Cherry-picking the version-bump to staging',
+    'CHERRYPICK',
+    [],
+    [],
+);
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the merge commit of target PR',
+    'Cherry-picking the merge commit of target PR',
+    'CHERRYPICK',
+    [],
+    [],
+    {HAS_CONFLICTS: false},
+);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK = utils.createMockStep(
+    'Cherry-pick the merge commit of target PR',
+    'Cherry-picking the merge commit of target PR',
+    'CHERRYPICK',
+    [],
+    [],
+    {HAS_CONFLICTS: true},
+);
+const CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK = utils.createMockStep('Push changes', 'Pushing changes', 'CHERRYPICK', [], []);
+const CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK = utils.createMockStep(
+    'Create Pull Request to manually finish CP',
+    'Creating Pull Request to manually finish CP',
+    'CHERRYPICK',
+    [],
+    ['GITHUB_TOKEN'],
+);
+const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+    'Announces a CP failure in the #announce Slack room',
+    'Announcing a CP failure',
+    'CHERRYPICK',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+
+const getCherryPickMockSteps = (upToDate, hasConflicts) => [
+    CHERRYPICK__CHERRYPICK__CHECKOUT_STAGING_BRANCH__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_VERSION_BUMP_TO_STAGING__STEP_MOCK,
+    hasConflicts
+        ? CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_CONFLICTS__STEP_MOCK
+        : CHERRYPICK__CHERRYPICK__CHERRY_PICK_THE_MERGE_COMMIT_OF_TARGET_PR_TO_NEW_BRANCH__HAS_NO_CONFLICTS__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__PUSH_CHANGES__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK,
+    CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK,
+];
+
+module.exports = {
+    CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
+    CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
+    CHERRYPICK__CREATENEWVERSION__STEP_MOCKS,
+    getCherryPickMockSteps,
+};
diff --git a/workflow_tests/mocks/claMocks.js b/workflow_tests/mocks/claMocks.js
new file mode 100644
index 000000000000..d0a6793b93e6
--- /dev/null
+++ b/workflow_tests/mocks/claMocks.js
@@ -0,0 +1,25 @@
+const utils = require('../utils/utils');
+
+// cla
+const CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {
+    match: 'I have read the CLA Document and I hereby sign the CLA',
+});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: ''});
+const CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK = utils.createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: 'recheck'});
+const CLA__CLA__CLA_ASSISTANT__STEP_MOCK = utils.createMockStep(
+    'CLA Assistant',
+    'CLA Assistant',
+    'CLA',
+    ['path-to-signatures', 'path-to-document', 'branch', 'remote-organization-name', 'remote-repository-name', 'lock-pullrequest-aftermerge', 'allowlist'],
+    ['GITHUB_TOKEN', 'PERSONAL_ACCESS_TOKEN'],
+);
+const CLA__CLA__NO_MATCHES__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+const CLA__CLA__CHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+const CLA__CLA__RECHECK_MATCH__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
+
+module.exports = {
+    CLA__CLA__NO_MATCHES__STEP_MOCKS,
+    CLA__CLA__CHECK_MATCH__STEP_MOCKS,
+    CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/createNewVersionMocks.js b/workflow_tests/mocks/createNewVersionMocks.js
new file mode 100644
index 000000000000..a1f601aef47f
--- /dev/null
+++ b/workflow_tests/mocks/createNewVersionMocks.js
@@ -0,0 +1,58 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'admin',
+});
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'write',
+});
+const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK = utils.createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    PERMISSION: 'read',
+});
+const CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK];
+const CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK];
+const CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK];
+
+// createnewversion
+const CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK = utils.createMockStep('Run turnstyle', 'Run turnstyle', 'CREATENEWVERSION', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK = utils.createMockStep('Check out', 'Check out', 'CREATENEWVERSION', ['ref', 'token'], []);
+const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup git for OSBotify',
+    'Setup git for OSBotify',
+    'CREATENEWVERSION',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = utils.createMockStep(
+    'Generate version',
+    'Generate version',
+    'CREATENEWVERSION',
+    ['GITHUB_TOKEN', 'SEMVER_LEVEL'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK = utils.createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK = utils.createMockStep('Update main branch', 'Update main branch', 'CREATENEWVERSION', [], []);
+const CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'CREATENEWVERSION',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS = [
+    CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK,
+    CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS,
+    CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS,
+    CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS,
+    CREATENEWVERSION__CREATENEWVERSION__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/deployBlockerMocks.js b/workflow_tests/mocks/deployBlockerMocks.js
new file mode 100644
index 000000000000..fbfc676f7701
--- /dev/null
+++ b/workflow_tests/mocks/deployBlockerMocks.js
@@ -0,0 +1,68 @@
+const utils = require('../utils/utils');
+
+// deployblocker
+const DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DEPLOYBLOCKER', ['token'], []);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__GET_URL_TITLE_AND_NUMBER_OF_NEW_DEPLOY_BLOCKER_ISSUE__STEP_MOCK = utils.createMockStep(
+    'Get URL, title, & number of new deploy blocker (issue)',
+    'Get URL, title and number of new deploy blocker - issue',
+    'DEPLOYBLOCKER',
+    [],
+    ['TITLE'],
+    {},
+    {
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_URL: '${{ github.event.issue.html_url }}',
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_NUMBER: '${{ github.event.issue.number }}',
+        // eslint-disable-next-line no-template-curly-in-string
+        DEPLOY_BLOCKER_TITLE: '${{ github.event.issue.title }}',
+    },
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__UPDATE_STAGINGDEPLOYCASH_WITH_NEW_DEPLOY_BLOCKER__STEP_MOCK = utils.createMockStep(
+    'Update StagingDeployCash with new deploy blocker',
+    'Update StagingDeployCash with new deploy blocker',
+    'DEPLOYBLOCKER',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_THE_ISSUE_OR_PR_THE_HOURLY_ENGINEERING_LABELS__STEP_MOCK = utils.createMockStep(
+    'Give the issue/PR the Hourly, Engineering labels',
+    'Give the issue/PR the Hourly, Engineering labels',
+    'DEPLOYBLOCKER',
+    ['add-labels', 'remove-labels'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK = utils.createMockStep(
+    'Post the issue in the #expensify-open-source slack room',
+    'Post the issue in the expensify-open-source slack room',
+    'DEPLOYBLOCKER',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEFERRED_PR__STEP_MOCK = utils.createMockStep(
+    'Comment on deferred PR',
+    'Comment on deferred PR',
+    'DEPLOYBLOCKER',
+    ['github_token', 'number'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'DEPLOYBLOCKER',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS = [
+    DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__GET_URL_TITLE_AND_NUMBER_OF_NEW_DEPLOY_BLOCKER_ISSUE__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__UPDATE_STAGINGDEPLOYCASH_WITH_NEW_DEPLOY_BLOCKER__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_THE_ISSUE_OR_PR_THE_HOURLY_ENGINEERING_LABELS__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEFERRED_PR__STEP_MOCK,
+    DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/deployMocks.js b/workflow_tests/mocks/deployMocks.js
new file mode 100644
index 000000000000..dfec48ca7dc3
--- /dev/null
+++ b/workflow_tests/mocks/deployMocks.js
@@ -0,0 +1,44 @@
+const utils = require('../utils/utils');
+
+const DEPLOY_STAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout staging branch', 'Checking out staging branch', 'DEPLOY_STAGING', ['ref', 'token']);
+const DEPLOY_STAGING__SETUP_GIT__STEP_MOCK = utils.createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_STAGING', ['GPG_PASSPHRASE']);
+const DEPLOY_STAGING__TAG_VERSION__STEP_MOCK = utils.createMockStep('Tag version', 'Tagging new version', 'DEPLOY_STAGING');
+const DEPLOY_STAGING__PUSH_TAG__STEP_MOCK = utils.createMockStep('🚀 Push tags to trigger staging deploy 🚀', 'Pushing tag to trigger staging deploy', 'DEPLOY_STAGING');
+const DEPLOY_STAGING_STEP_MOCKS = [DEPLOY_STAGING__CHECKOUT__STEP_MOCK, DEPLOY_STAGING__SETUP_GIT__STEP_MOCK, DEPLOY_STAGING__TAG_VERSION__STEP_MOCK, DEPLOY_STAGING__PUSH_TAG__STEP_MOCK];
+
+const DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DEPLOY_PRODUCTION', ['ref', 'token']);
+const DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK = utils.createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_PRODUCTION', ['GPG_PASSPHRASE']);
+const DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK = utils.createMockStep('Get current app version', 'Getting current app version', 'DEPLOY_PRODUCTION', null, null, null, {
+    PRODUCTION_VERSION: '1.2.3',
+});
+const DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK = utils.createMockStep(
+    'Get Release Pull Request List',
+    'Getting release PR list',
+    'DEPLOY_PRODUCTION',
+    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
+    null,
+    {PR_LIST: '["1.2.1", "1.2.2"]'},
+);
+const DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK = utils.createMockStep('Generate Release Body', 'Generating release body', 'DEPLOY_PRODUCTION', ['PR_LIST'], null, {
+    RELEASE_BODY: 'Release body',
+});
+const DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK = utils.createMockStep(
+    '🚀 Create release to trigger production deploy 🚀',
+    'Creating release to trigger production deploy',
+    'DEPLOY_PRODUCTION',
+    ['tag_name', 'body'],
+    ['GITHUB_TOKEN'],
+);
+const DEPLOY_PRODUCTION_STEP_MOCKS = [
+    DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK,
+    DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK,
+    DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK,
+    DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK,
+    DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK,
+    DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK,
+];
+
+module.exports = {
+    DEPLOY_STAGING_STEP_MOCKS,
+    DEPLOY_PRODUCTION_STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/finishReleaseCycleMocks.js b/workflow_tests/mocks/finishReleaseCycleMocks.js
new file mode 100644
index 000000000000..e1bb0d112429
--- /dev/null
+++ b/workflow_tests/mocks/finishReleaseCycleMocks.js
@@ -0,0 +1,165 @@
+const utils = require('../utils/utils');
+
+// validate
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK = utils.createMockStep(
+    'Validate actor is deployer',
+    'Validating if actor is deployer',
+    'VALIDATE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK = utils.createMockStep(
+    'Validate actor is deployer',
+    'Validating if actor is deployer',
+    'VALIDATE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+    'Reopen and comment on issue (not a team member)',
+    'Reopening issue - not a team member',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER', 'COMMENT'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK = utils.createMockStep(
+    'Check for any deploy blockers',
+    'Checking for deploy blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+    {HAS_DEPLOY_BLOCKERS: false},
+);
+const FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK = utils.createMockStep(
+    'Check for any deploy blockers',
+    'Checking for deploy blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+    {HAS_DEPLOY_BLOCKERS: true},
+);
+const FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK = utils.createMockStep(
+    'Reopen and comment on issue (has blockers)',
+    'Reopening issue - blockers',
+    'VALIDATE',
+    ['GITHUB_TOKEN', 'ISSUE_NUMBER'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'VALIDATE',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+// eslint-disable-next-line rulesdir/no-negated-variables
+const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
+    FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_FALSE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_NOT_A_TEAM_MEMBER__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__CHECK_FOR_ANY_DEPLOY_BLOCKERS_TRUE__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__REOPEN_AND_COMMENT_ON_ISSUE_HAS_BLOCKERS__STEP_MOCK,
+    FINISHRELEASECYCLE__VALIDATE__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+// updateproduction
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATEPRODUCTION', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup Git for OSBotify',
+    'Setup Git for OSBotify',
+    'UPDATEPRODUCTION',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK = utils.createMockStep('Update production branch', 'Updating production branch', 'UPDATEPRODUCTION', [], []);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'UPDATEPRODUCTION',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS = [
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__CHECKOUT__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+// createnewpatchversion
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATENEWPATCHVERSION',
+    ['SEMVER_LEVEL'],
+    [],
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS = [FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK];
+
+// updatestaging
+const FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'UPDATESTAGING', ['ref', 'token'], []);
+const FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = utils.createMockStep(
+    'Setup Git for OSBotify',
+    'Setup Git for OSBotify',
+    'UPDATESTAGING',
+    ['GPG_PASSPHRASE'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK = utils.createMockStep(
+    'Update staging branch to trigger staging deploy',
+    'Updating staging branch',
+    'UPDATESTAGING',
+    [],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow in Slack',
+    'Announce failed workflow in Slack',
+    'UPDATESTAGING',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS = [
+    FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK,
+    FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
+];
+
+module.exports = {
+    FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS,
+    FINISHRELEASECYCLE__UPDATEPRODUCTION__STEP_MOCKS,
+    FINISHRELEASECYCLE__CREATENEWPATCHVERSION__STEP_MOCKS,
+    FINISHRELEASECYCLE__UPDATESTAGING__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/lintMocks.js b/workflow_tests/mocks/lintMocks.js
new file mode 100644
index 000000000000..ecf11074e20f
--- /dev/null
+++ b/workflow_tests/mocks/lintMocks.js
@@ -0,0 +1,17 @@
+const utils = require('../utils/utils');
+
+// lint
+const LINT__LINT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'LINT', [], []);
+const LINT__LINT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'LINT', [], []);
+const LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK = utils.createMockStep('Lint JavaScript and Typescript with ESLint', 'Lint JavaScript with ESLint', 'LINT', [], ['CI']);
+const LINT__LINT__LINT_SHELL_SCRIPTS_WITH_SHELLCHECK__STEP_MOCK = utils.createMockStep('Lint shell scripts with ShellCheck', 'Lint shell scripts with ShellCheck', 'LINT', [], []);
+const LINT__LINT__STEP_MOCKS = [
+    LINT__LINT__CHECKOUT__STEP_MOCK,
+    LINT__LINT__SETUP_NODE__STEP_MOCK,
+    LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK,
+    LINT__LINT__LINT_SHELL_SCRIPTS_WITH_SHELLCHECK__STEP_MOCK,
+];
+
+module.exports = {
+    LINT__LINT__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/lockDeploysMocks.js b/workflow_tests/mocks/lockDeploysMocks.js
new file mode 100644
index 000000000000..bb6246a2e1d9
--- /dev/null
+++ b/workflow_tests/mocks/lockDeploysMocks.js
@@ -0,0 +1,35 @@
+const utils = require('../utils/utils');
+
+// lockstagingdeploys
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'LOCKSTAGINGDEPLOYS', ['ref', 'token'], []);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK = utils.createMockStep(
+    'Wait for staging deploys to finish',
+    'Waiting for staging deploys to finish',
+    'LOCKSTAGINGDEPLOYS',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK = utils.createMockStep(
+    'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
+    'Commenting in StagingDeployCash',
+    'LOCKSTAGINGDEPLOYS',
+    [],
+    ['GITHUB_TOKEN'],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK = utils.createMockStep(
+    'Announce failed workflow',
+    'Announcing failed workflow in Slack',
+    'LOCKSTAGINGDEPLOYS',
+    ['SLACK_WEBHOOK'],
+    [],
+);
+const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS = [
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK,
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__ANNOUNCE_FAILED_WORKFLOW__STEP_MOCK,
+];
+
+module.exports = {
+    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/platformDeployMocks.js b/workflow_tests/mocks/platformDeployMocks.js
new file mode 100644
index 000000000000..9e0b91b29156
--- /dev/null
+++ b/workflow_tests/mocks/platformDeployMocks.js
@@ -0,0 +1,281 @@
+const utils = require('../utils/utils');
+
+// validateActor
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if the user is a deployer',
+    'VALIDATE_ACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: true},
+);
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK = utils.createMockStep(
+    'Check if user is deployer',
+    'Checking if the user is a deployer',
+    'VALIDATE_ACTOR',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_DEPLOYER: false},
+);
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK];
+const PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS = [PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK];
+
+// deployChecklist
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DEPLOY_CHECKLIST');
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'DEPLOY_CHECKLIST');
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Set version', 'DEPLOY_CHECKLIST', [], [], {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CREATE_OR_UPDATE_STAGING_DEPLOY__STEP_MOCK = utils.createMockStep(
+    'Create or update staging deploy',
+    'Create or update staging deploy',
+    'DEPLOY_CHECKLIST',
+    ['GITHUB_TOKEN', 'NPM_VERSION'],
+);
+const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS = [
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__CREATE_OR_UPDATE_STAGING_DEPLOY__STEP_MOCK,
+];
+
+// android
+const PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'ANDROID');
+const PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'ANDROID', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypting keystore', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypting JSON key', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version in ENV', 'Setting version in ENV', 'ANDROID', null, null, null, {VERSION_CODE: '1.2.3'});
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = utils.createMockStep('Run Fastlane beta', 'Running Fastlane beta', 'ANDROID', null, [
+    'MYAPP_UPLOAD_STORE_PASSWORD',
+    'MYAPP_UPLOAD_KEY_PASSWORD',
+]);
+const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = utils.createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']);
+const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
+const PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK = utils.createMockStep(
+    'Upload Android version to Browser Stack',
+    'Uploading Android version to Browser Stack',
+    'ANDROID',
+    null,
+    ['BROWSERSTACK'],
+);
+const PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK = utils.createMockStep(
+    'Warn deployers if Android production deploy failed',
+    'Warning deployers of failed production deploy',
+    'ANDROID',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__ANDROID__STEP_MOCKS = [
+    PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,
+    PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK,
+];
+
+// desktop
+const PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'DESKTOP');
+const PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK = utils.createMockStep('Decrypt Developer ID Certificate', 'Decrypting developer id certificate', 'DESKTOP', null, [
+    'DEVELOPER_ID_SECRET_PASSPHRASE',
+]);
+const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build production desktop app', 'Building production desktop app', 'DESKTOP', null, [
+    'CSC_LINK',
+    'CSC_KEY_PASSWORD',
+    'APPLE_ID',
+    'APPLE_APP_SPECIFIC_PASSWORD',
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build staging desktop app', 'Building staging desktop app', 'DESKTOP', null, [
+    'CSC_LINK',
+    'CSC_KEY_PASSWORD',
+    'APPLE_ID',
+    'APPLE_APP_SPECIFIC_PASSWORD',
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS = [
+    PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__DESKTOP__BUILD_STAGING__STEP_MOCK,
+];
+
+// ios
+const PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'IOS');
+const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'IOS');
+const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']);
+const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+    'cache-hit': false,
+});
+const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep(
+    'Compare Podfile.lock and Manifest.lock',
+    'Compare Podfile.lock and Manifest.lock',
+    'IOS',
+    [],
+    [],
+    {IS_PODFILE_SAME_AS_MANIFEST: false},
+);
+const PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Installing cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt profile', 'Decrypting profile', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypting certificate', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
+const PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK = utils.createMockStep('Decrypt App Store Connect API key', 'Decrypting App Store API key', 'IOS', null, [
+    'LARGE_SECRET_PASSPHRASE',
+]);
+const PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Running Fastlane', 'IOS', null, [
+    'APPLE_CONTACT_EMAIL',
+    'APPLE_CONTACT_PHONE',
+    'APPLE_DEMO_EMAIL',
+    'APPLE_DEMO_PASSWORD',
+]);
+const PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK = utils.createMockStep('Archive iOS sourcemaps', 'Archiving sourcemaps', 'IOS', ['name', 'path']);
+const PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK = utils.createMockStep('Upload iOS version to Browser Stack', 'Uploading version to Browser Stack', 'IOS', null, ['BROWSERSTACK']);
+const PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set iOS version in ENV', 'Setting iOS version', 'IOS', null, null, null, {IOS_VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane for App Store release', 'Running Fastlane for release', 'IOS', null, ['VERSION']);
+const PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK = utils.createMockStep(
+    'Warn deployers if iOS production deploy failed',
+    'Warning developers of failed deploy',
+    'IOS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__IOS__STEP_MOCKS = [
+    PLATFORM_DEPLOY__IOS__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_PROFILE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__ARCHIVE_SOURCEMAPS__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK,
+    PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK,
+];
+
+// web
+const PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'WEB');
+const PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'WEB');
+const PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK = utils.createMockStep('Setup Cloudflare CLI', 'Setting up Cloudflare CLI', 'WEB');
+const PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep('Configure AWS Credentials', 'Configuring AWS credentials', 'WEB', [
+    'AWS_ACCESS_KEY_ID',
+    'AWS_SECRET_ACCESS_KEY',
+]);
+const PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK = utils.createMockStep('Build web for production', 'Building web for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK = utils.createMockStep('Build web for staging', 'Building web for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK = utils.createMockStep('Build storybook docs for production', 'Build storybook docs for production', 'WEB');
+const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK = utils.createMockStep('Build storybook docs for staging', 'Build storybook docs for staging', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK = utils.createMockStep('Deploy production to S3', 'Deploying production to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK = utils.createMockStep('Deploy staging to S3', 'Deploying staging to S3', 'WEB');
+const PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK = utils.createMockStep('Purge production Cloudflare cache', 'Purging production Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK = utils.createMockStep('Purge staging Cloudflare cache', 'Purging staging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
+const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
+    PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK,
+    PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK,
+];
+
+// post slack message on failure
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK = utils.createMockStep('Post Slack message on failure', 'Posting Slack message on platform deploy failure', 'POST_SLACK_FAIL', [
+    'SLACK_WEBHOOK',
+]);
+const PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS = [PLATFORM_DEPLOY__POST_SLACK_FAIL__POST_SLACK__STEP_MOCK];
+
+// post slack message on success
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_SLACK_SUCCESS');
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_SLACK_SUCCESS', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces the deploy in the #announce Slack room',
+    'Posting message to \\#announce channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces the deploy in the #deployer Slack room',
+    'Posting message to \\#deployer channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK = utils.createMockStep(
+    'Announces a production deploy in the #expensify-open-source Slack room',
+    'Posting message to \\#expensify-open-source channel',
+    'POST_SLACK_SUCCESS',
+    ['status'],
+    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
+);
+const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS = [
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__EXPENSIFY_CHANNEL__STEP_MOCK,
+];
+
+// post github comment
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checking out', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setting up Node', 'POST_GITHUB_COMMENT');
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK = utils.createMockStep('Set version', 'Setting version', 'POST_GITHUB_COMMENT', null, null, null, {VERSION: '1.2.3'});
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = utils.createMockStep(
+    'Get Release Pull Request List',
+    'Getting release pull request list',
+    'POST_GITHUB_COMMENT',
+    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
+    null,
+    {PR_LIST: '[1.2.1, 1.2.2]'},
+);
+const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK = utils.createMockStep('Comment on issues', 'Commenting on issues', 'POST_GITHUB_COMMENT', [
+    'PR_LIST',
+    'IS_PRODUCTION_DEPLOY',
+    'DEPLOY_VERSION',
+    'GITHUB_TOKEN',
+    'ANDROID',
+    'DESKTOP',
+    'IOS',
+    'WEB',
+]);
+const PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS = [
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__CHECKOUT__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK,
+    PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK,
+];
+
+module.exports = {
+    PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS,
+    PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+    PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+    PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+    PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+    PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+    PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+    PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/preDeployMocks.js b/workflow_tests/mocks/preDeployMocks.js
new file mode 100644
index 000000000000..3dc67a904cf9
--- /dev/null
+++ b/workflow_tests/mocks/preDeployMocks.js
@@ -0,0 +1,201 @@
+const utils = require('../utils/utils');
+
+// typecheck
+const TYPECHECK_WORKFLOW_MOCK_STEP = utils.createMockStep('Run typecheck workflow', 'Running typecheck workflow', 'TYPECHECK');
+const TYPECHECK_JOB_MOCK_STEPS = [TYPECHECK_WORKFLOW_MOCK_STEP];
+
+// lint
+const LINT_WORKFLOW_MOCK_STEP = utils.createMockStep('Run lint workflow', 'Running lint workflow', 'LINT');
+const LINT_JOB_MOCK_STEPS = [LINT_WORKFLOW_MOCK_STEP];
+
+// test
+const TEST_WORKFLOW_MOCK_STEP = utils.createMockStep('Run test workflow', 'Running test workflow', 'TEST');
+const TEST_JOB_MOCK_STEPS = [TEST_WORKFLOW_MOCK_STEP];
+
+// confirm_passing_build
+const ANNOUNCE_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in slack', 'CONFIRM_PASSING_BUILD', ['SLACK_WEBHOOK']);
+const CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS = [
+    ANNOUNCE_IN_SLACK_MOCK_STEP,
+
+    // 2nd step runs normally
+];
+
+// choose_deploy_actions
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY = utils.createMockStep('Get merged pull request', 'Getting merged pull request', 'CHOOSE_DEPLOY_ACTIONS', ['github_token'], null, {
+    number: '123',
+    labels: '[]',
+});
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED = utils.createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: true},
+);
+const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED = utils.createMockStep(
+    'Check if StagingDeployCash is locked',
+    'Checking StagingDeployCash',
+    'CHOOSE_DEPLOY_ACTIONS',
+    ['GITHUB_TOKEN'],
+    null,
+    {IS_LOCKED: false},
+);
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED,
+
+    // step 3 runs normally
+];
+const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED = [
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
+    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED,
+
+    // step 3 runs normally
+];
+
+// skip_deploy
+const COMMENT_ON_DEFERRED_PR_MOCK_STEP = utils.createMockStep('Comment on deferred PR', 'Skipping deploy', 'SKIP_DEPLOY', ['github_token', 'number', 'body']);
+const SKIP_DEPLOY_JOB_MOCK_STEPS = [COMMENT_ON_DEFERRED_PR_MOCK_STEP];
+
+// create_new_version
+const CREATE_NEW_VERSION_MOCK_STEP = utils.createMockStep(
+    'Create new version',
+    'Creating new version',
+    'CREATE_NEW_VERSION',
+    null,
+    null,
+    {NEW_VERSION: '1.2.3'},
+    null,
+    true,
+    'createNewVersion',
+);
+const CREATE_NEW_VERSION_JOB_MOCK_STEPS = [CREATE_NEW_VERSION_MOCK_STEP];
+
+// update_staging
+const RUN_TURNSTYLE_MOCK_STEP = utils.createMockStep('Run turnstyle', 'Running turnstyle', 'UPDATE_STAGING', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
+const CHECKOUT_MAIN_MOCK_STEP = utils.createMockStep('Checkout main', 'Checkout main', 'UPDATE_STAGING', ['ref', 'token']);
+const SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP = utils.createMockStep('Setup Git for OSBotify', 'Setup Git for OSBotify', 'UPDATE_STAGING', ['GPG_PASSPHRASE']);
+const UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP = utils.createMockStep('Update staging branch from main', 'Update staging branch from main', 'UPDATE_STAGING');
+const ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP = utils.createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in Slack', 'UPDATE_STAGING', ['SLACK_WEBHOOK']);
+const UPDATE_STAGING_JOB_MOCK_STEPS = [
+    RUN_TURNSTYLE_MOCK_STEP,
+    CHECKOUT_MAIN_MOCK_STEP,
+    SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP,
+    UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP,
+    ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP,
+];
+
+// is_expensify_employee
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'IS_EXPENSIFY_EMPLOYEE',
+    ['github_token'],
+    null,
+    {author: 'Dummy Author'},
+);
+const CHECK_TEAM_MEMBERSHIP_MOCK_STEP__TRUE = utils.createMockStep(
+    'Check whether the PR author is member of Expensify/expensify team',
+    'Checking actors Expensify membership',
+    'IS_EXPENSIFY_EMPLOYEE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_EXPENSIFY_EMPLOYEE: true},
+);
+const IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE = [GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE, CHECK_TEAM_MEMBERSHIP_MOCK_STEP__TRUE];
+const CHECK_TEAM_MEMBERSHIP_MOCK_STEP__FALSE = utils.createMockStep(
+    'Check whether the PR author is member of Expensify/expensify team',
+    'Checking actors Expensify membership',
+    'IS_EXPENSIFY_EMPLOYEE',
+    [],
+    ['GITHUB_TOKEN'],
+    {IS_EXPENSIFY_EMPLOYEE: false},
+);
+const IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE = [GET_MERGED_PULL_REQUEST_MOCK_STEP__IS_EXPENSIFY_EMPLOYEE, CHECK_TEAM_MEMBERSHIP_MOCK_STEP__FALSE];
+
+// new_contributor_welcome_message
+const CHECKOUT_MOCK_STEP = utils.createMockStep('Checkout', 'Checking out', 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', ['token'], null, {author: 'Dummy Author'});
+const CHECKOUT_MOCK_STEP__OSBOTIFY = utils.createMockStep('Checkout', 'Checking out', 'NEW_CONTRIBUTOR_WELCOME_MESSAGE', ['token'], null, {author: 'OSBotify'});
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token'],
+    null,
+    {number: '12345', author: 'Dummy Author'},
+);
+const GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE__OSBOTIFY = utils.createMockStep(
+    'Get merged pull request',
+    'Getting merged pull request',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token'],
+    null,
+    {number: '12345', author: 'OSBotify'},
+);
+const GET_PR_COUNT_MOCK_STEP__1 = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    'Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}',
+    'Getting PR count',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    null,
+    ['GITHUB_TOKEN'],
+    null,
+    {PR_COUNT: '1'},
+);
+const GET_PR_COUNT_MOCK_STEP__10 = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    'Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}',
+    'Getting PR count',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    null,
+    ['GITHUB_TOKEN'],
+    null,
+    {PR_COUNT: '10'},
+);
+const COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP = utils.createMockStep(
+    // eslint-disable-next-line no-template-curly-in-string
+    "Comment on ${{ steps.getMergedPullRequest.outputs.author }}\\'s first pull request!",
+    'Creating comment',
+    'NEW_CONTRIBUTOR_WELCOME_MESSAGE',
+    ['github_token', 'number', 'body'],
+);
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS = [
+    CHECKOUT_MOCK_STEP,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE,
+    GET_PR_COUNT_MOCK_STEP__10,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR = [
+    CHECKOUT_MOCK_STEP,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE,
+    GET_PR_COUNT_MOCK_STEP__1,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+const NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY = [
+    CHECKOUT_MOCK_STEP__OSBOTIFY,
+    GET_MERGED_PULL_REQUEST_MOCK_STEP__WELCOME_MESSAGE__OSBOTIFY,
+    GET_PR_COUNT_MOCK_STEP__10,
+    COMMENT_ON_FIRST_PULL_REQUEST_MOCK_STEP,
+];
+
+const PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP = utils.createMockStep('Perform E2E tests', 'Perform E2E tests', 'E2EPERFORMANCETESTS');
+const PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS = [PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP];
+
+module.exports = {
+    TYPECHECK_JOB_MOCK_STEPS,
+    LINT_JOB_MOCK_STEPS,
+    TEST_JOB_MOCK_STEPS,
+    CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+    SKIP_DEPLOY_JOB_MOCK_STEPS,
+    CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+    UPDATE_STAGING_JOB_MOCK_STEPS,
+    IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+    IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR,
+    NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+    PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+};
diff --git a/workflow_tests/mocks/reviewerChecklistMocks.js b/workflow_tests/mocks/reviewerChecklistMocks.js
new file mode 100644
index 000000000000..5f9ef67198a8
--- /dev/null
+++ b/workflow_tests/mocks/reviewerChecklistMocks.js
@@ -0,0 +1,9 @@
+const utils = require('../utils/utils');
+
+// checklist
+const REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK = utils.createMockStep('reviewerChecklist.js', 'reviewerChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
+const REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS = [REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK];
+
+module.exports = {
+    REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/testBuildMocks.js b/workflow_tests/mocks/testBuildMocks.js
new file mode 100644
index 000000000000..bdff0ac57ae1
--- /dev/null
+++ b/workflow_tests/mocks/testBuildMocks.js
@@ -0,0 +1,263 @@
+const utils = require('../utils/utils');
+
+// validateactor
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    IS_EXPENSIFY_EMPLOYEE: true,
+});
+const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK = utils.createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
+    IS_EXPENSIFY_EMPLOYEE: false,
+});
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK = utils.createMockStep(
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'VALIDATEACTOR',
+    [],
+    ['PULL_REQUEST_NUMBER', 'GITHUB_TOKEN'],
+    {HAS_READY_TO_BUILD_LABEL: true},
+);
+const TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK = utils.createMockStep(
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'Set HAS_READY_TO_BUILD_LABEL flag',
+    'VALIDATEACTOR',
+    [],
+    ['PULL_REQUEST_NUMBER', 'GITHUB_TOKEN'],
+    {HAS_READY_TO_BUILD_LABEL: false},
+);
+const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__TRUE__STEP_MOCK,
+];
+const TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS = [
+    TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK,
+    TESTBUILD__VALIDATEACTOR__SET_HAS_READY_TO_BUILD_LABEL_FLAG__FALSE__STEP_MOCK,
+];
+
+// getbranchref
+const TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'GETBRANCHREF', [], []);
+const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK = utils.createMockStep(
+    'Check if pull request number is correct',
+    'Check if pull request number is correct',
+    'GETBRANCHREF',
+    [],
+    ['GITHUB_TOKEN'],
+    {REF: 'test-ref'},
+);
+const TESTBUILD__GETBRANCHREF__STEP_MOCKS = [TESTBUILD__GETBRANCHREF__CHECKOUT__STEP_MOCK, TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK];
+
+// android
+const TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'ANDROID', ['ref'], []);
+const TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'ANDROID',
+    [],
+    [],
+);
+const TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'ANDROID', [], []);
+const TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'ANDROID', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = utils.createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = utils.createMockStep('Decrypt json key', 'Decrypt json key', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'ANDROID',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
+const TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK = utils.createMockStep(
+    'Run Fastlane beta test',
+    'Run Fastlane beta test',
+    'ANDROID',
+    [],
+    ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION', 'MYAPP_UPLOAD_STORE_PASSWORD', 'MYAPP_UPLOAD_KEY_PASSWORD'],
+);
+const TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'ANDROID', ['name', 'path'], []);
+const TESTBUILD__ANDROID__STEP_MOCKS = [
+    TESTBUILD__ANDROID__CHECKOUT__STEP_MOCK,
+    TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK,
+    TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK,
+    TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK,
+    TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK,
+    TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK,
+];
+
+// ios
+const TESTBUILD__IOS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'IOS', ['ref'], []);
+const TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = utils.createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
+const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'IOS',
+    [],
+    [],
+);
+const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = utils.createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []);
+const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = utils.createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []);
+const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = utils.createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
+    'cache-hit': false,
+});
+const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = utils.createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
+    IS_PODFILE_SAME_AS_MANIFEST: false,
+});
+const TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK = utils.createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], []);
+const TESTBUILD__IOS__DECRYPT_PROFILE__STEP_MOCK = utils.createMockStep('Decrypt profile', 'Decrypt profile', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = utils.createMockStep('Decrypt certificate', 'Decrypt certificate', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
+const TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'IOS',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK = utils.createMockStep('Run Fastlane', 'Run Fastlane', 'IOS', [], ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION']);
+const TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Upload Artifact', 'Upload Artifact', 'IOS', ['name', 'path'], []);
+const TESTBUILD__IOS__STEP_MOCKS = [
+    TESTBUILD__IOS__CHECKOUT__STEP_MOCK,
+    TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
+    TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK,
+    TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK,
+    TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK,
+    TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK,
+    TESTBUILD__IOS__INSTALL_COCOAPODS__STEP_MOCK,
+    TESTBUILD__IOS__DECRYPT_PROFILE__STEP_MOCK,
+    TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK,
+    TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK,
+    TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK,
+];
+
+// desktop
+const TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'DESKTOP', ['ref'], []);
+const TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'DESKTOP',
+    [],
+    [],
+);
+const TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'DESKTOP', [], []);
+const TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK = utils.createMockStep(
+    'Decrypt Developer ID Certificate',
+    'Decrypt Developer ID Certificate',
+    'DESKTOP',
+    [],
+    ['DEVELOPER_ID_SECRET_PASSPHRASE'],
+);
+const TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'DESKTOP',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK = utils.createMockStep(
+    'Build desktop app for testing',
+    'Build desktop app for testing',
+    'DESKTOP',
+    [],
+    ['CSC_LINK', 'CSC_KEY_PASSWORD', 'APPLE_ID', 'APPLE_APP_SPECIFIC_PASSWORD', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+);
+const TESTBUILD__DESKTOP__STEP_MOCKS = [
+    TESTBUILD__DESKTOP__CHECKOUT__STEP_MOCK,
+    TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK,
+    TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK,
+];
+
+// web
+const TESTBUILD__WEB__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'WEB', ['ref'], []);
+const TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK = utils.createMockStep(
+    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
+    'Creating .env.adhoc file based on staging',
+    'WEB',
+    [],
+    [],
+);
+const TESTBUILD__WEB__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'WEB', [], []);
+const TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = utils.createMockStep(
+    'Configure AWS Credentials',
+    'Configure AWS Credentials',
+    'WEB',
+    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+    [],
+);
+const TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK = utils.createMockStep('Build web for testing', 'Build web for testing', 'WEB', [], []);
+const TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK = utils.createMockStep('Build docs', 'Build docs', 'WEB', [], []);
+const TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK = utils.createMockStep('Deploy to S3 for internal testing', 'Deploy to S3 for internal testing', 'WEB', [], []);
+const TESTBUILD__WEB__STEP_MOCKS = [
+    TESTBUILD__WEB__CHECKOUT__STEP_MOCK,
+    TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK,
+    TESTBUILD__WEB__SETUP_NODE__STEP_MOCK,
+    TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK,
+    TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK,
+    TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK,
+    TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK,
+];
+
+// postgithubcomment
+const TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'POSTGITHUBCOMMENT', ['ref'], []);
+const TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK = utils.createMockStep('Download Artifact', 'Download Artifact', 'POSTGITHUBCOMMENT', [], []);
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK = utils.createMockStep(
+    'Read JSONs with android paths',
+    'Read JSONs with android paths',
+    'POSTGITHUBCOMMENT',
+    [],
+    [],
+    {android_path: 'http://dummy.android.link'},
+);
+const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK = utils.createMockStep('Read JSONs with iOS paths', 'Read JSONs with iOS paths', 'POSTGITHUBCOMMENT', [], [], {
+    ios_path: 'http://dummy.ios.link',
+});
+const TESTBUILD__POSTGITHUBCOMMENT__MAINTAIN_COMMENT__STEP_MOCK = utils.createMockStep(
+    'maintain-comment',
+    'maintain-comment',
+    'POSTGITHUBCOMMENT',
+    ['token', 'body-include', 'number', 'delete'],
+    [],
+);
+const TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK = utils.createMockStep(
+    'Publish links to apps for download',
+    'Publish links to apps for download',
+    'POSTGITHUBCOMMENT',
+    ['PR_NUMBER', 'GITHUB_TOKEN', 'ANDROID', 'DESKTOP', 'IOS', 'WEB', 'ANDROID_LINK', 'DESKTOP_LINK', 'IOS_LINK', 'WEB_LINK'],
+    [],
+);
+const TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS = [
+    TESTBUILD__POSTGITHUBCOMMENT__CHECKOUT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__MAINTAIN_COMMENT__STEP_MOCK,
+    TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK,
+];
+
+module.exports = {
+    TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+    TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+    TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+    TESTBUILD__ANDROID__STEP_MOCKS,
+    TESTBUILD__IOS__STEP_MOCKS,
+    TESTBUILD__DESKTOP__STEP_MOCKS,
+    TESTBUILD__WEB__STEP_MOCKS,
+    TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/testMocks.js b/workflow_tests/mocks/testMocks.js
new file mode 100644
index 000000000000..19011271bb47
--- /dev/null
+++ b/workflow_tests/mocks/testMocks.js
@@ -0,0 +1,26 @@
+const utils = require('../utils/utils');
+
+// jest
+const TEST__JEST__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'JEST', [], []);
+const TEST__JEST__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'JEST', [], []);
+const TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK = utils.createMockStep('Get number of CPU cores', 'Get number of CPU cores', 'JEST', [], [], {count: 8});
+const TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK = utils.createMockStep('Cache Jest cache', 'Cache Jest cache', 'JEST', ['path', 'key'], []);
+const TEST__JEST__JEST_TESTS__STEP_MOCK = utils.createMockStep('Jest tests', 'Jest tests', 'JEST', [], []);
+const TEST__JEST__STEP_MOCKS = [
+    TEST__JEST__CHECKOUT__STEP_MOCK,
+    TEST__JEST__SETUP_NODE__STEP_MOCK,
+    TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK,
+    TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK,
+    TEST__JEST__JEST_TESTS__STEP_MOCK,
+];
+
+// shelltests
+const TEST__SHELLTESTS__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK = utils.createMockStep('Test CI git logic', 'Test CI git logic', 'SHELLTESTS', [], []);
+const TEST__SHELLTESTS__STEP_MOCKS = [TEST__SHELLTESTS__CHECKOUT__STEP_MOCK, TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK, TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK];
+
+module.exports = {
+    TEST__JEST__STEP_MOCKS,
+    TEST__SHELLTESTS__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/validateGithubActionsMocks.js b/workflow_tests/mocks/validateGithubActionsMocks.js
new file mode 100644
index 000000000000..e2d48932acf6
--- /dev/null
+++ b/workflow_tests/mocks/validateGithubActionsMocks.js
@@ -0,0 +1,23 @@
+const utils = require('../utils/utils');
+
+// verify
+const VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK = utils.createMockStep(
+    'Verify Javascript Action Builds',
+    'Verify Javascript Action Builds',
+    'VERIFY',
+    [],
+    [],
+);
+const VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK = utils.createMockStep('Validate actions and workflows', 'Validate actions and workflows', 'VERIFY', [], []);
+const VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS = [
+    VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK,
+    VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK,
+];
+
+module.exports = {
+    VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifyPodfileMocks.js b/workflow_tests/mocks/verifyPodfileMocks.js
new file mode 100644
index 000000000000..0a82eebcc748
--- /dev/null
+++ b/workflow_tests/mocks/verifyPodfileMocks.js
@@ -0,0 +1,11 @@
+const utils = require('../utils/utils');
+
+// verify
+const VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK = utils.createMockStep('Checkout', 'Checkout', 'VERIFY');
+const VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK = utils.createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK = utils.createMockStep('Verify podfile', 'Verify podfile', 'VERIFY', [], []);
+const VERIFYPODFILE__VERIFY__STEP_MOCKS = [VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK, VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK, VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK];
+
+module.exports = {
+    VERIFYPODFILE__VERIFY__STEP_MOCKS,
+};
diff --git a/workflow_tests/mocks/verifySignedCommitsMocks.js b/workflow_tests/mocks/verifySignedCommitsMocks.js
new file mode 100644
index 000000000000..a19fac809e55
--- /dev/null
+++ b/workflow_tests/mocks/verifySignedCommitsMocks.js
@@ -0,0 +1,15 @@
+const utils = require('../utils/utils');
+
+// verifysignedcommits
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK = utils.createMockStep(
+    'Verify signed commits',
+    'Verify signed commits',
+    'VERIFYSIGNEDCOMMITS',
+    ['GITHUB_TOKEN'],
+    [],
+);
+const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS = [VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK];
+
+module.exports = {
+    VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+};
diff --git a/workflow_tests/platformDeploy.test.js b/workflow_tests/platformDeploy.test.js
new file mode 100644
index 000000000000..e74b8e873001
--- /dev/null
+++ b/workflow_tests/platformDeploy.test.js
@@ -0,0 +1,273 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/platformDeployAssertions');
+const mocks = require('./mocks/platformDeployMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'platformDeploy.yml'),
+        dest: '.github/workflows/platformDeploy.yml',
+    },
+];
+
+describe('test workflow platformDeploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testPlatformDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: [],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('push', () => {
+        describe('tag', () => {
+            it('as team member - platform deploy executes on staging', async () => {
+                const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'Dummy Author');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, true, false, true);
+                assertions.assertDesktopJobExecuted(result, true, false);
+                assertions.assertIOSJobExecuted(result, true, false, true);
+                assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false);
+            });
+
+            it('as OSBotify - platform deploy executes on staging', async () => {
+                const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'OSBotify');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, true, false, true);
+                assertions.assertDesktopJobExecuted(result, true, false);
+                assertions.assertIOSJobExecuted(result, true, false, true);
+                assertions.assertWebJobExecuted(result, true, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, true, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false);
+            });
+
+            it('as outsider - platform deploy does not execute', async () => {
+                const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {
+                        ref: 'refs/tags/1.2.3',
+                        ref_type: 'tag',
+                        ref_name: '1.2.3',
+                    },
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_store_password',
+                        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_key_password',
+                        BROWSERSTACK: 'dummy_browserstack',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_secret_passphrase',
+                        CSC_LINK: 'dummy_csc_link',
+                        CSC_KEY_PASSWORD: 'dummy_csc_key_pass',
+                        APPLE_ID: 'dummy_apple_id',
+                        APPLE_ID_PASSWORD: 'dummy_apple_pass',
+                        AWS_ACCESS_KEY_ID: 'dummy_aws_access_key_id',
+                        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+                        APPLE_CONTACT_EMAIL: 'dummy@email.com',
+                        APPLE_CONTACT_PHONE: '123456789',
+                        APPLE_DEMO_EMAIL: 'dummy.demo@email.com',
+                        APPLE_DEMO_PASSWORD: 'dummy_password',
+                        CLOUDFLARE_TOKEN: 'dummy_cloudflare_token',
+                    },
+                    'dummy_github_token',
+                    {
+                        AS_REPO: 'App',
+                    },
+                );
+                act = utils.setJobRunners(
+                    act,
+                    {
+                        desktop: 'ubuntu-latest',
+                        iOS: 'ubuntu-latest',
+                        android: 'ubuntu-latest',
+                        web: 'ubuntu-latest',
+                    },
+                    workflowPath,
+                );
+                const testMockSteps = {
+                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__OUTSIDER__STEP_MOCKS,
+                    deployChecklist: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
+                    android: mocks.PLATFORM_DEPLOY__ANDROID__STEP_MOCKS,
+                    desktop: mocks.PLATFORM_DEPLOY__DESKTOP__STEP_MOCKS,
+                    iOS: mocks.PLATFORM_DEPLOY__IOS__STEP_MOCKS,
+                    web: mocks.PLATFORM_DEPLOY__WEB__STEP_MOCKS,
+                    postSlackMessageOnFailure: mocks.PLATFORM_DEPLOY__POST_SLACK_FAIL__STEP_MOCKS,
+                    postSlackMessageOnSuccess: mocks.PLATFORM_DEPLOY__POST_SLACK_SUCCESS__STEP_MOCKS,
+                    postGithubComment: mocks.PLATFORM_DEPLOY__POST_GITHUB_COMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Author',
+                    logFile: utils.getLogFilePath('platformDeploy', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyActorJobExecuted(result, 'Dummy Author');
+                assertions.assertDeployChecklistJobExecuted(result, true);
+                assertions.assertAndroidJobExecuted(result, false);
+                assertions.assertDesktopJobExecuted(result, false);
+                assertions.assertIOSJobExecuted(result, false);
+                assertions.assertWebJobExecuted(result, false);
+                assertions.assertPostSlackOnFailureJobExecuted(result, false);
+                assertions.assertPostSlackOnSuccessJobExecuted(result, false);
+                assertions.assertPostGithubCommentJobExecuted(result, true, false, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/preDeploy.test.js b/workflow_tests/preDeploy.test.js
new file mode 100644
index 000000000000..4a4d9dcc82bb
--- /dev/null
+++ b/workflow_tests/preDeploy.test.js
@@ -0,0 +1,1087 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/preDeployAssertions');
+const mocks = require('./mocks/preDeployMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'preDeploy.yml'),
+        dest: '.github/workflows/preDeploy.yml',
+    },
+];
+
+describe('test workflow preDeploy', () => {
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testPreDeployWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    pushedBranches: ['different_branch'],
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    it('push to main - workflow executes', async () => {
+        // get path to the local test repo
+        const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+
+        // get path to the workflow file under test
+        const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+
+        // instantiate Act in the context of the test repo and given workflow file
+        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+
+        // set run parameters
+        act = utils.setUpActParams(
+            act,
+            'push',
+            {ref: 'refs/heads/main'},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+
+        // set up mocks
+        const testMockSteps = {
+            confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+            chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+            skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+            updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+            isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+            newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+        };
+        const testMockJobs = {
+            typecheck: {
+                steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            lint: {
+                steps: mocks.LINT_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            test: {
+                steps: mocks.TEST_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            createNewVersion: {
+                steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                outputs: {
+                    // eslint-disable-next-line no-template-curly-in-string
+                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                },
+                runsOn: 'ubuntu-latest',
+            },
+            e2ePerformanceTests: {
+                steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+        };
+
+        // run an event and get the result
+        const result = await act.runEvent('push', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+
+        // assert results (some steps can run in parallel to each other so the order is not assured
+        // therefore we can check which steps have been executed, but not the set job order
+        assertions.assertTypecheckJobExecuted(result);
+        assertions.assertLintJobExecuted(result);
+        assertions.assertTestJobExecuted(result);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result);
+        assertions.assertChooseDeployActionsJobExecuted(result);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result);
+        assertions.assertUpdateStagingJobExecuted(result);
+    });
+
+    it('different event than push - workflow does not execute', async () => {
+        const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+        const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        const testMockSteps = {
+            confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+            chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+            skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+            updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+            isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+            newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+        };
+        const testMockJobs = {
+            typecheck: {
+                steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            lint: {
+                steps: mocks.LINT_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            test: {
+                steps: mocks.TEST_JOB_MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+            createNewVersion: {
+                steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                outputs: {
+                    // eslint-disable-next-line no-template-curly-in-string
+                    NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                },
+                runsOn: 'ubuntu-latest',
+            },
+            e2ePerformanceTests: {
+                steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                runsOn: 'ubuntu-latest',
+            },
+        };
+
+        // pull_request
+        act = utils.setUpActParams(
+            act,
+            'pull_request',
+            {head: {ref: 'main'}},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        let result = await act.runEvent('pull_request', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+        assertions.assertTypecheckJobExecuted(result, false);
+        assertions.assertLintJobExecuted(result, false);
+        assertions.assertTestJobExecuted(result, false);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result, false);
+        assertions.assertChooseDeployActionsJobExecuted(result, false);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result, false);
+        assertions.assertUpdateStagingJobExecuted(result, false);
+
+        // workflow_dispatch
+        act = utils.setUpActParams(
+            act,
+            'workflow_dispatch',
+            {},
+            {
+                OS_BOTIFY_TOKEN: 'dummy_token',
+                SLACK_WEBHOOK: 'dummy_slack_webhook',
+                LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+            },
+            'dummy_github_token',
+        );
+        result = await act.runEvent('workflow_dispatch', {
+            workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+            mockSteps: testMockSteps,
+            actor: 'Dummy Tester',
+            logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+            mockJobs: testMockJobs,
+        });
+        assertions.assertTypecheckJobExecuted(result, false);
+        assertions.assertLintJobExecuted(result, false);
+        assertions.assertTestJobExecuted(result, false);
+        assertions.assertIsExpensifyEmployeeJobExecuted(result, false);
+        assertions.assertChooseDeployActionsJobExecuted(result, false);
+        assertions.assertSkipDeployJobExecuted(result, false);
+        assertions.assertCreateNewVersionJobExecuted(result, false);
+        assertions.assertUpdateStagingJobExecuted(result, false);
+    });
+
+    describe('confirm passing build', () => {
+        it('typecheck job failed - workflow exits', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: [utils.createMockStep('Run typecheck workflow', 'Running typecheck workflow - Typecheck workflow failed', 'TYPECHECK', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            expect(result).toEqual(
+                expect.arrayContaining([utils.createStepAssertion('Run typecheck workflow', false, null, 'TYPECHECK', 'Running typecheck workflow - Typecheck workflow failed')]),
+            );
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        it('lint job failed - workflow exits', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: [utils.createMockStep('Run lint workflow', 'Running lint workflow - Lint workflow failed', 'LINT', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            expect(result).toEqual(expect.arrayContaining([utils.createStepAssertion('Run lint workflow', false, null, 'LINT', 'Running lint workflow - Lint workflow failed')]));
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        it('test job failed - workflow exits', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: [utils.createMockStep('Run test workflow', 'Running test workflow - Test workflow failed', 'TEST', null, null, null, null, false)],
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            expect(result).toEqual(expect.arrayContaining([utils.createStepAssertion('Run test workflow', false, null, 'TEST', 'Running test workflow - Test workflow failed')]));
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            expect(result).toEqual(
+                expect.arrayContaining([
+                    utils.createStepAssertion('Announce failed workflow in Slack', true, null, 'CONFIRM_PASSING_BUILD', 'Announcing failed workflow in slack', [
+                        {key: 'SLACK_WEBHOOK', value: '***'},
+                    ]),
+                    utils.createStepAssertion('Exit failed workflow', false, ''),
+                ]),
+            );
+            assertions.assertChooseDeployActionsJobExecuted(result, false);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result, false);
+            assertions.assertUpdateStagingJobExecuted(result, false);
+        });
+
+        it('lint and test job succeed - workflow continues', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result);
+            assertions.assertUpdateStagingJobExecuted(result);
+        });
+    });
+
+    describe('new contributor welcome message', () => {
+        it('actor is OSBotify - no comment left', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'OSBotify',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, false);
+        });
+
+        it('actor is Expensify employee - no comment left', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, false);
+        });
+
+        it('actor is not Expensify employee, its not their first PR - job triggers, but no comment left', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, true, false, false);
+        });
+
+        it('actor is not Expensify employee, and its their first PR - job triggers and comment left', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__FALSE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__ONE_PR,
+            };
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertNewContributorWelcomeMessageJobExecuted(result, true, false, true);
+        });
+    });
+
+    describe('choose deploy actions', () => {
+        describe('staging locked', () => {
+            it('not automated PR - deploy skipped and comment left', async () => {
+                const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, 'push', {ref: 'refs/heads/main'}, {OS_BOTIFY_TOKEN: 'dummy_token', SLACK_WEBHOOK: 'dummy_slack_webhook'}, 'dummy_github_token');
+                const testMockSteps = {
+                    confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Tester',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+
+            it('automated PR - deploy skipped, but no comment left', async () => {
+                const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, 'push', {ref: 'refs/heads/main'}, {OS_BOTIFY_TOKEN: 'dummy_token', SLACK_WEBHOOK: 'dummy_slack_webhook'}, 'dummy_github_token');
+                const testMockSteps = {
+                    confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+        });
+
+        describe('staging not locked', () => {
+            it('not automated PR - proceed with deploy', async () => {
+                const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {ref: 'refs/heads/main'},
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                    },
+                    'dummy_github_token',
+                );
+                const testMockSteps = {
+                    confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'Dummy Tester',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result);
+                assertions.assertUpdateStagingJobExecuted(result, true);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+
+            it('automated PR - deploy skipped, but no comment left', async () => {
+                const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(
+                    act,
+                    'push',
+                    {ref: 'refs/heads/main'},
+                    {
+                        OS_BOTIFY_TOKEN: 'dummy_token',
+                        SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    },
+                    'dummy_github_token',
+                );
+                const testMockSteps = {
+                    confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                    chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                    skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                    updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                    isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                    newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__OSBOTIFY,
+                };
+                const testMockJobs = {
+                    typecheck: {
+                        steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    lint: {
+                        steps: mocks.LINT_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    test: {
+                        steps: mocks.TEST_JOB_MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                    createNewVersion: {
+                        steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                        outputs: {
+                            // eslint-disable-next-line no-template-curly-in-string
+                            NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                        },
+                        runsOn: 'ubuntu-latest',
+                    },
+                    e2ePerformanceTests: {
+                        steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                        runsOn: 'ubuntu-latest',
+                    },
+                };
+                const result = await act.runEvent('push', {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                    mockSteps: testMockSteps,
+                    actor: 'OSBotify',
+                    logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                    mockJobs: testMockJobs,
+                });
+                assertions.assertTypecheckJobExecuted(result);
+                assertions.assertLintJobExecuted(result);
+                assertions.assertTestJobExecuted(result);
+                assertions.assertIsExpensifyEmployeeJobExecuted(result);
+                assertions.assertChooseDeployActionsJobExecuted(result);
+                assertions.assertSkipDeployJobExecuted(result, false);
+                assertions.assertCreateNewVersionJobExecuted(result, false);
+                assertions.assertUpdateStagingJobExecuted(result, false);
+                assertions.assertUpdateStagingJobFailed(result, false);
+            });
+        });
+
+        it('one of updateStaging steps failed - failure announced in Slack', async () => {
+            const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(
+                act,
+                'push',
+                {ref: 'refs/heads/main'},
+                {
+                    OS_BOTIFY_TOKEN: 'dummy_token',
+                    SLACK_WEBHOOK: 'dummy_slack_webhook',
+                    LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+                },
+                'dummy_github_token',
+            );
+            const testMockSteps = {
+                confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
+                chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
+                skipDeploy: mocks.SKIP_DEPLOY_JOB_MOCK_STEPS,
+                updateStaging: mocks.UPDATE_STAGING_JOB_MOCK_STEPS,
+                isExpensifyEmployee: mocks.IS_EXPENSIFY_EMPLOYEE_JOB_MOCK_STEPS__TRUE,
+                newContributorWelcomeMessage: mocks.NEW_CONTRIBUTOR_WELCOME_MESSAGE_JOB_MOCK_STEPS__MANY_PRS,
+            };
+            testMockSteps.updateStaging[3].mockWith = 'exit 1';
+            const testMockJobs = {
+                typecheck: {
+                    steps: mocks.TYPECHECK_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                lint: {
+                    steps: mocks.LINT_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                test: {
+                    steps: mocks.TEST_JOB_MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+                createNewVersion: {
+                    steps: mocks.CREATE_NEW_VERSION_JOB_MOCK_STEPS,
+                    outputs: {
+                        // eslint-disable-next-line no-template-curly-in-string
+                        NEW_VERSION: '${{ steps.createNewVersion.outputs.NEW_VERSION }}',
+                    },
+                    runsOn: 'ubuntu-latest',
+                },
+                e2ePerformanceTests: {
+                    steps: mocks.PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
+                    runsOn: 'ubuntu-latest',
+                },
+            };
+            const result = await act.runEvent('push', {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'preDeploy.yml'),
+                mockSteps: testMockSteps,
+                actor: 'Dummy Tester',
+                logFile: utils.getLogFilePath('preDeploy', expect.getState().currentTestName),
+                mockJobs: testMockJobs,
+            });
+            assertions.assertTypecheckJobExecuted(result);
+            assertions.assertLintJobExecuted(result);
+            assertions.assertTestJobExecuted(result);
+            assertions.assertIsExpensifyEmployeeJobExecuted(result);
+            assertions.assertChooseDeployActionsJobExecuted(result);
+            assertions.assertSkipDeployJobExecuted(result, false);
+            assertions.assertCreateNewVersionJobExecuted(result);
+            assertions.assertUpdateStagingJobFailed(result, true);
+        });
+    });
+});
diff --git a/workflow_tests/reviewerChecklist.test.js b/workflow_tests/reviewerChecklist.test.js
new file mode 100644
index 000000000000..9903c3eb4b8d
--- /dev/null
+++ b/workflow_tests/reviewerChecklist.test.js
@@ -0,0 +1,84 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/reviewerChecklistAssertions');
+const mocks = require('./mocks/reviewerChecklistMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'reviewerChecklist.yml'),
+        dest: '.github/workflows/reviewerChecklist.yml',
+    },
+];
+
+describe('test workflow reviewerChecklist', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testReviewerChecklistWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is pull_request_review', () => {
+        const event = 'pull_request_review';
+        const eventOptions = {};
+        it('runs the workflow', async () => {
+            const repoPath = mockGithub.repo.getPath('testReviewerChecklistWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('reviewerChecklist', expect.getState().currentTestName),
+            });
+
+            assertions.assertChecklistJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            const osbotifyActor = 'OSBotify';
+            it('does not run the workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testReviewerChecklistWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('reviewerChecklist', expect.getState().currentTestName),
+                });
+
+                assertions.assertChecklistJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/scripts/runWorkflowTests.sh b/workflow_tests/scripts/runWorkflowTests.sh
new file mode 100755
index 000000000000..71ddcdceffb5
--- /dev/null
+++ b/workflow_tests/scripts/runWorkflowTests.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+source ./scripts/shellUtils.sh
+
+title 'GitHub Actions workflow tests'
+printf '\n'
+
+# Check setup
+info 'Checking environment setup'
+
+# Check if docker is installed
+if ! docker --version > /dev/null 2>&1; then
+  error 'Docker is not installed'
+  info 'Act requires docker to be installed. Please install docker and try again'
+  exit 1
+fi
+info 'Docker installed'
+
+# Check if docker is running
+if ! docker info > /dev/null 2>&1; then
+  error 'Docker is not running'
+  info 'Act requires docker engine to be running. Enable docker engine and try again'
+  exit 1
+fi
+info 'Docker engine running'
+
+# Check if act is installed
+if ! act --version > /dev/null 2>&1; then
+  error 'Act not installed'
+  info 'Install Act with brew install act and follow the documentation on first Act run (https://github.com/nektos/act#first-act-run)'
+  exit 1
+fi
+info 'Act installed'
+
+# Check if ACT_BINARY is set
+if [[ -z ${ACT_BINARY} ]]; then
+  info 'ACT_BINARY not set, checking .env file'
+  if [ -f .env ]; then
+    set -a
+    source .env
+    set +a
+  else
+    info '.env file does not exist'
+  fi
+  if [[ -z ${ACT_BINARY} ]]; then
+    error 'ACT_BINARY variable not set'
+    info 'To make sure Act behaves in a predictable manner please set the ACT_BINARY environment variable to the path to your Act binary'
+    exit 1
+  fi
+fi
+info 'ACT_BINARY environment variable set'
+
+if ! eval '${ACT_BINARY} --version' > /dev/null 2>&1; then
+  error 'ACT_BINARY variable not set properly'
+  info 'ACT_BINARY environment variable should be set to the path to your Act executable. Please set the variable correctly (try running "which act" to check the path)'
+  exit 1
+fi
+info 'ACT_BINARY environment variable set to an Act executable'
+
+success 'Environment setup properly - running tests'
+
+# Run tests
+npm test -- --config=workflow_tests/jest.config.js --runInBand "$@"
diff --git a/workflow_tests/test.test.js b/workflow_tests/test.test.js
new file mode 100644
index 000000000000..6efe8d260928
--- /dev/null
+++ b/workflow_tests/test.test.js
@@ -0,0 +1,184 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/testAssertions');
+const mocks = require('./mocks/testMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'test.yml'),
+        dest: '.github/workflows/test.yml',
+    },
+];
+
+describe('test workflow test', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const osbotifyActor = 'OSBotify';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testTestWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        it('runs all tests', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            it('does not run tests', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result, false);
+                assertions.assertShellTestsJobExecuted(result, false);
+            });
+        });
+    });
+
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        it('runs all tests', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            it('does not run tests', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result, false);
+                assertions.assertShellTestsJobExecuted(result, false);
+            });
+        });
+    });
+
+    describe('event is workflow_call', () => {
+        const event = 'workflow_call';
+        const eventOptions = {};
+        it('runs all tests', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                jest: mocks.TEST__JEST__STEP_MOCKS,
+                shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+            });
+
+            assertions.assertJestJobExecuted(result);
+            assertions.assertShellTestsJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            it('runs all tests normally', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                const testMockSteps = {
+                    jest: mocks.TEST__JEST__STEP_MOCKS,
+                    shellTests: mocks.TEST__SHELLTESTS__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'test.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('test', expect.getState().currentTestName),
+                });
+
+                assertions.assertJestJobExecuted(result);
+                assertions.assertShellTestsJobExecuted(result);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/testBuild.test.js b/workflow_tests/testBuild.test.js
new file mode 100644
index 000000000000..4288ea236ab2
--- /dev/null
+++ b/workflow_tests/testBuild.test.js
@@ -0,0 +1,753 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/testBuildAssertions');
+const mocks = require('./mocks/testBuildMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'testBuild.yml'),
+        dest: '.github/workflows/testBuild.yml',
+    },
+];
+
+describe('test workflow testBuild', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const secrets = {
+        OS_BOTIFY_TOKEN: 'dummy_osbotify_token',
+        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
+        AWS_ACCESS_KEY_ID: 'dummy_aws_access_kry_id',
+        AWS_SECRET_ACCESS_KEY: 'dummy_aws_secret_access_key',
+        DEVELOPER_ID_SECRET_PASSPHRASE: 'dummy_developer_id_secret_passphrase',
+        CSC_LINK: 'dummy_csc_link',
+        CSC_KEY_PASSWORD: 'dummy_csc_key_password',
+        APPLE_ID_PASSWORD: 'dummy_apple_id_password',
+        APPLE_ID: 'dummy_apple_id_value',
+        MYAPP_UPLOAD_STORE_PASSWORD: 'dummy_myapp_upload_store_password',
+        MYAPP_UPLOAD_KEY_PASSWORD: 'dummy_myapp_upload_key_password',
+    };
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testTestBuildWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('event is workflow_dispatch', () => {
+        const event = 'workflow_dispatch';
+        const inputs = {
+            PULL_REQUEST_NUMBER: '1234',
+        };
+        it('executes workflow', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+            act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('android fails', () => {
+            it('executes workflow, failure reflected', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: utils.deepCopy(mocks.TESTBUILD__ANDROID__STEP_MOCKS),
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.android[4] = utils.createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE'], {}, {}, false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', true, 4);
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'failure', 'success', 'success', 'success');
+            });
+        });
+        describe('iOS fails', () => {
+            it('executes workflow, failure reflected', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: utils.deepCopy(mocks.TESTBUILD__IOS__STEP_MOCKS),
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.iOS[8] = utils.createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], [], {}, {}, false);
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref', true, 8);
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'failure', 'success', 'success');
+            });
+        });
+        describe('desktop fails', () => {
+            it('executes workflow, failure reflected', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: utils.deepCopy(mocks.TESTBUILD__DESKTOP__STEP_MOCKS),
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.desktop[3] = utils.createMockStep(
+                    'Decrypt Developer ID Certificate',
+                    'Decrypt Developer ID Certificate',
+                    'DESKTOP',
+                    [],
+                    ['DEVELOPER_ID_SECRET_PASSPHRASE'],
+                    {},
+                    {},
+                    false,
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref', true, 3);
+                assertions.assertWebJobExecuted(result, 'test-ref');
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'success', 'failure', 'success');
+            });
+        });
+        describe('web fails', () => {
+            it('executes workflow, failure reflected', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: utils.deepCopy(mocks.TESTBUILD__WEB__STEP_MOCKS),
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                testMockSteps.web[3] = utils.createMockStep(
+                    'Configure AWS Credentials',
+                    'Configure AWS Credentials',
+                    'WEB',
+                    ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'],
+                    [],
+                    {},
+                    {},
+                    false,
+                );
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result);
+                assertions.assertAndroidJobExecuted(result, 'test-ref');
+                assertions.assertIOSJobExecuted(result, 'test-ref');
+                assertions.assertDesktopJobExecuted(result, 'test-ref');
+                assertions.assertWebJobExecuted(result, 'test-ref', true, 3);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', true, 'success', 'success', 'success', 'failure');
+            });
+        });
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'opened',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        it('executes workflow, without getBranchRef', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+            act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'synchronize',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        it('executes workflow, without getBranchRef', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+            act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+    describe('pull request labeled', () => {
+        const event = 'pull_request_target';
+        const eventOptions = {
+            action: 'labeled',
+            number: '1234',
+            pull_request: {
+                head: {
+                    sha: 'test-ref',
+                },
+            },
+        };
+        it('executes workflow, withuout getBranchRef', async () => {
+            const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+            act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+            });
+
+            assertions.assertValidateActorJobExecuted(result, '1234');
+            assertions.assertGetBranchRefJobExecuted(result, false);
+            assertions.assertAndroidJobExecuted(result, 'test-ref');
+            assertions.assertIOSJobExecuted(result, 'test-ref');
+            assertions.assertDesktopJobExecuted(result, 'test-ref');
+            assertions.assertWebJobExecuted(result, 'test-ref');
+            assertions.assertPostGithubCommentJobExecuted(result, 'test-ref');
+        });
+        describe('actor is not a team member', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_HAS_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+        describe('actor is not a team member and PR does not have READY_TO_BUILD label', () => {
+            it('stops the workflow after validation', async () => {
+                const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
+                act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    validateActor: mocks.TESTBUILD__VALIDATEACTOR__NO_TEAM_MEMBER_NO_FLAG__STEP_MOCKS,
+                    getBranchRef: mocks.TESTBUILD__GETBRANCHREF__STEP_MOCKS,
+                    android: mocks.TESTBUILD__ANDROID__STEP_MOCKS,
+                    iOS: mocks.TESTBUILD__IOS__STEP_MOCKS,
+                    desktop: mocks.TESTBUILD__DESKTOP__STEP_MOCKS,
+                    web: mocks.TESTBUILD__WEB__STEP_MOCKS,
+                    postGithubComment: mocks.TESTBUILD__POSTGITHUBCOMMENT__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'testBuild.yml'),
+                    mockSteps: testMockSteps,
+                    actor,
+                    logFile: utils.getLogFilePath('testBuild', expect.getState().currentTestName),
+                });
+
+                assertions.assertValidateActorJobExecuted(result, '1234');
+                assertions.assertGetBranchRefJobExecuted(result, false);
+                assertions.assertAndroidJobExecuted(result, 'test-ref', false);
+                assertions.assertIOSJobExecuted(result, 'test-ref', false);
+                assertions.assertDesktopJobExecuted(result, 'test-ref', false);
+                assertions.assertWebJobExecuted(result, 'test-ref', false);
+                assertions.assertPostGithubCommentJobExecuted(result, 'test-ref', '1234', false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/utils/ExtendedAct.js b/workflow_tests/utils/ExtendedAct.js
new file mode 100644
index 000000000000..9b4ab1bebda2
--- /dev/null
+++ b/workflow_tests/utils/ExtendedAct.js
@@ -0,0 +1,44 @@
+const kieActJs = require('@kie/act-js');
+const path = require('path');
+const _ = require('underscore');
+const JobMocker = require('./JobMocker');
+
+class ExtendedAct extends kieActJs.Act {
+    async parseRunOpts(opts) {
+        const {cwd, actArguments, proxy} = await super.parseRunOpts(opts);
+        if (opts && opts.actor) {
+            actArguments.push('--actor', opts.actor);
+        }
+        return {cwd, actArguments, proxy};
+    }
+
+    async runEvent(event, opts) {
+        const {mockJobs, ...vanillaOpts} = opts;
+        if (mockJobs) {
+            await this.handleJobMocking((workflow) => workflow.events.includes(event), {mockJobs, workflowFile: opts.workflowFile, cwd: opts.cwd});
+        }
+        return super.runEvent(event, vanillaOpts);
+    }
+
+    async handleJobMocking(filter, opts) {
+        let workflowFiles;
+        if (opts.workflowFile) {
+            workflowFiles = [path.basename(opts.workflowFile)];
+        } else if (this.workflowFile !== this.cwd) {
+            workflowFiles = [path.basename(this.workflowFile)];
+        } else {
+            workflowFiles = _(_(await this.list(undefined, opts.cwd, opts.workflowFile)).filter(filter)).map((l) => l.workflowFile);
+        }
+        return Promise.all(
+            _(workflowFiles).map((workflowFile) => {
+                // eslint-disable-next-line es/no-nullish-coalescing-operators
+                const jobMocker = new JobMocker.JobMocker(workflowFile, opts.cwd ?? this.cwd);
+                return jobMocker.mock(opts.mockJobs);
+            }),
+        );
+    }
+}
+
+module.exports = {
+    ExtendedAct,
+};
diff --git a/workflow_tests/utils/JobMocker.js b/workflow_tests/utils/JobMocker.js
new file mode 100644
index 000000000000..a2682a657380
--- /dev/null
+++ b/workflow_tests/utils/JobMocker.js
@@ -0,0 +1,83 @@
+const fs = require('fs');
+const path = require('path');
+const yaml = require('yaml');
+const _ = require('underscore');
+
+class JobMocker {
+    constructor(workflowFile, cwd) {
+        this.workflowFile = workflowFile;
+        this.cwd = cwd;
+    }
+
+    async mock(mockJobs) {
+        const filePath = this.getWorkflowPath();
+        const workflow = await this.readWorkflowFile(filePath);
+        Object.entries(mockJobs).forEach(([jobId, mockJob]) => {
+            const job = this.locateJob(workflow, jobId);
+            if (job) {
+                if (job.uses) {
+                    delete job.uses;
+                }
+                if (job.secrets) {
+                    delete job.secrets;
+                }
+                let jobWith;
+                if (job.with) {
+                    jobWith = job.with;
+                    delete job.with;
+                }
+                job.steps = _(mockJob.steps).map((step) => {
+                    const mockStep = {
+                        name: step.name,
+                        run: step.mockWith,
+                    };
+                    if (step.id) {
+                        mockStep.id = step.id;
+                    }
+                    if (jobWith) {
+                        mockStep.with = jobWith;
+                    }
+                    return mockStep;
+                });
+                if (mockJob.outputs) {
+                    job.outputs = mockJob.outputs;
+                }
+                if (mockJob.runsOn) {
+                    job['runs-on'] = mockJob.runsOn;
+                }
+            } else {
+                throw new Error('Could not find job');
+            }
+        });
+        return this.writeWorkflowFile(filePath, workflow);
+    }
+
+    locateJob(workflow, jobId) {
+        return workflow.jobs[jobId];
+    }
+
+    getWorkflowPath() {
+        if (fs.existsSync(path.join(this.cwd, this.workflowFile))) {
+            return path.join(this.cwd, this.workflowFile);
+        }
+        if (this.cwd.endsWith('.github')) {
+            return path.join(this.cwd, 'workflows', this.workflowFile);
+        }
+        if (fs.existsSync(path.join(this.cwd, '.github', 'workflows', this.workflowFile))) {
+            return path.join(this.cwd, '.github', 'workflows', this.workflowFile);
+        }
+        throw new Error(`Could not locate ${this.workflowFile}`);
+    }
+
+    async readWorkflowFile(location) {
+        return yaml.parse(fs.readFileSync(location, 'utf8'));
+    }
+
+    async writeWorkflowFile(location, data) {
+        return fs.writeFileSync(location, yaml.stringify(data), 'utf8');
+    }
+}
+
+module.exports = {
+    JobMocker,
+};
diff --git a/workflow_tests/utils/preGenerateTest.js b/workflow_tests/utils/preGenerateTest.js
new file mode 100644
index 000000000000..4ed485abec40
--- /dev/null
+++ b/workflow_tests/utils/preGenerateTest.js
@@ -0,0 +1,281 @@
+/* eslint no-console: ["error", { allow: ["warn", "log"] }] */
+const path = require('path');
+const {exit} = require('process');
+const fs = require('fs');
+const yaml = require('yaml');
+const _ = require('underscore');
+
+const workflowsDirectory = path.resolve(__dirname, '..', '..', '.github', 'workflows');
+const workflowTestsDirectory = path.resolve(__dirname, '..');
+const workflowTestMocksDirectory = path.join(workflowTestsDirectory, 'mocks');
+const workflowTestAssertionsDirectory = path.join(workflowTestsDirectory, 'assertions');
+const workflowFilePattern = '\\w+\\.yml';
+const workflowFileRegex = new RegExp(workflowFilePattern, 'g');
+
+const capitalize = (s) => (s && s.charAt(0).toUpperCase() + s.slice(1)) || '';
+const mockFileTemplate = (mockSteps, exports) => `const utils = require('../utils/utils');
+${mockSteps}
+${exports}
+`;
+const assertionFileTemplate = (jobAssertions, exports) => `const utils = require('../utils/utils');
+${jobAssertions}
+${exports}
+`;
+const testFileTemplate = (workflowName) => `const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/${workflowName}Assertions');
+const mocks = require('./mocks/${workflowName}Mocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', '${workflowName}.yml'),
+        dest: '.github/workflows/${workflowName}.yml',
+    },
+];
+
+describe('test workflow ${workflowName}', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                test${capitalize(workflowName)}WorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                    
+                    // if any branches besides main are need add: pushedBranches: ['staging', 'production'],
+                },
+            },
+        });
+    
+        await mockGithub.setup();
+    });
+    
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    it('test stub', async () => {
+        const repoPath = mockGithub.repo.getPath('test${capitalize(workflowName)}WorkflowRepo') || '';
+        const workflowPath = path.join(repoPath, '.github', 'workflows', '${workflowName}.yml');
+        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        act = utils.setUpActParams(
+            act,
+            '[EVENT]',
+            {},
+            {},
+            githubToken,
+        );
+        const testMockSteps = {
+            // mock steps with imported mocks
+        };
+        const result = await act
+            .runEvent('[EVENT]', {
+                workflowFile: path.join(repoPath, '.github', 'workflows'),
+                mockSteps: testMockSteps,
+                actor,
+            });
+            
+        // assert execution with imported assertions
+    });
+});
+`;
+const mockStepTemplate = (stepMockName, step, jobId) => `
+const ${stepMockName} = utils.getMockStep(
+    '${step.name || ''}',
+    '${step.name || ''}',
+    ${jobId ? `'${jobId.toUpperCase()}'` : 'null'},
+    ${step.inputs ? JSON.stringify(step.inputs).replaceAll('"', "'") : 'null'},
+    ${step.envs ? JSON.stringify(step.envs).replaceAll('"', "'") : 'null'},
+    // add outputs if needed
+);`;
+const stepAssertionTemplate = (step_name, job_id, step_message, inputs, envs) => `
+        utils.getStepAssertion(
+            '${step_name}',
+            true,
+            null,
+            '${job_id}',
+            '${step_message}',
+            [${_(inputs).map((input) => `{key: '${input}', value: '[FILL_IN]'}`)}],
+            [${_(envs).map((env) => `{key: '${env}', value: '[FILL_IN]'}`)}],
+        ),`;
+const jobMocksTemplate = (jobMocksName, stepMocks) => `
+const ${jobMocksName} = [${_(stepMocks).map(
+    (stepMock) => `
+    ${stepMock}`,
+)}
+];`;
+const jobAssertionTemplate = (jobAssertionName, stepAssertions) => `
+const ${jobAssertionName} = (workflowResult, didExecute = true) => {
+    const steps = [${stepAssertions}
+    ];
+
+    for (const expectedStep of steps) {
+        if (didExecute) {
+            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
+        } else {
+            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
+        }
+    }
+};`;
+const mocksExportsTemplate = (jobMocks) => `
+module.exports = {
+    ${_(jobMocks).map((jobMock) => `${jobMock}`)}
+};`;
+const assertionsExportsTemplate = (jobAssertions) => `
+module.exports = {
+    ${_(jobAssertions).map((jobAssertion) => `${jobAssertion}`)}
+};`;
+
+const checkArguments = (args) => {
+    if (args.length > 0 && args[0]) {
+        return;
+    }
+    console.warn('Please provide workflow file name');
+    exit(1);
+};
+const checkWorkflowFileName = (fileName) => {
+    if (workflowFileRegex.test(fileName)) {
+        return;
+    }
+    console.warn(`Please provide a valid workflow file name ([workflow].yml) instead of ${fileName}`);
+    exit(1);
+};
+const checkWorkflowFilePath = (filePath) => {
+    if (fs.existsSync(filePath)) {
+        return;
+    }
+    console.warn(`Provided workflow file does not exist: ${filePath}`);
+    exit(1);
+};
+const checkIfTestFileExists = (testsDirectory, testFileName) => {
+    if (!fs.existsSync(path.join(testsDirectory, testFileName))) {
+        return;
+    }
+    console.warn(`The test file ${testFileName} already exists, exiting`);
+    exit(1);
+};
+const checkIfMocksFileExists = (mocksDirectory, mocksFileName) => {
+    if (!fs.existsSync(path.join(mocksDirectory, mocksFileName))) {
+        return;
+    }
+    console.warn(`The mocks file ${mocksFileName} already exists, exiting`);
+    exit(1);
+};
+const checkIfAssertionsFileExists = (assertionsDirectory, assertionsFileName) => {
+    if (!fs.existsSync(path.join(assertionsDirectory, assertionsFileName))) {
+        return;
+    }
+    console.warn(`The assertions file ${assertionsFileName} already exists, exiting`);
+    exit(1);
+};
+const parseWorkflowFile = (workflow) => {
+    const workflowJobs = {};
+    Object.entries(workflow.jobs).forEach(([jobId, job]) => {
+        workflowJobs[jobId] = {
+            steps: [],
+        };
+        job.steps.forEach((step) => {
+            const workflowStep = {
+                name: step.name || '',
+                inputs: _.keys(step.with || {}) || [],
+                envs: _.keys(step.env || {}) || [],
+            };
+            workflowJobs[jobId].steps.push(workflowStep);
+        });
+    });
+    return workflowJobs;
+};
+const getMockFileContent = (workflowName, jobs) => {
+    let content = '';
+    const jobMocks = [];
+    Object.entries(jobs).forEach(([jobId, job]) => {
+        let mockStepsContent = `\n// ${jobId.toLowerCase()}`;
+        const stepMocks = [];
+        job.steps.forEach((step) => {
+            const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${step.name
+                .replaceAll(' ', '_')
+                .replaceAll('-', '_')
+                .replaceAll(',', '')
+                .replaceAll('#', '')
+                .toUpperCase()}__STEP_MOCK`;
+            stepMocks.push(stepMockName);
+            mockStepsContent += mockStepTemplate(stepMockName, step, jobId);
+        });
+        const jobMocksName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__STEP_MOCKS`;
+        jobMocks.push(jobMocksName);
+        mockStepsContent += jobMocksTemplate(jobMocksName, stepMocks);
+        content += mockStepsContent;
+    });
+    return mockFileTemplate(content, mocksExportsTemplate(jobMocks));
+};
+const getAssertionsFileContent = (workflowName, jobs) => {
+    let content = '';
+    const jobAssertions = [];
+    Object.entries(jobs).forEach(([jobId, job]) => {
+        let stepAssertionsContent = '';
+        job.steps.forEach((step) => {
+            stepAssertionsContent += stepAssertionTemplate(step.name, jobId.toUpperCase(), step.name, step.inputs, step.envs);
+        });
+        const jobAssertionName = `assert${jobId.charAt(0).toUpperCase() + jobId.slice(1)}JobExecuted`;
+        jobAssertions.push(jobAssertionName);
+        content += jobAssertionTemplate(jobAssertionName, stepAssertionsContent);
+    });
+    return assertionFileTemplate(content, assertionsExportsTemplate(jobAssertions));
+};
+const getTestFileContent = (workflowName) => testFileTemplate(workflowName);
+
+const call_args = process.argv.slice(2);
+checkArguments(call_args);
+
+const workflowFileName = call_args[0];
+checkWorkflowFileName(workflowFileName);
+
+const workflowName = workflowFileName.slice(0, -4);
+const workflowFilePath = path.join(workflowsDirectory, workflowFileName);
+checkWorkflowFilePath(workflowFilePath);
+
+const workflowTestFileName = `${workflowName}.test.js`;
+checkIfTestFileExists(workflowTestsDirectory, workflowTestFileName);
+
+const workflowTestMocksFileName = `${workflowName}Mocks.js`;
+checkIfMocksFileExists(workflowTestMocksDirectory, workflowTestMocksFileName);
+
+const workflowTestAssertionsFileName = `${workflowName}Assertions.js`;
+checkIfAssertionsFileExists(workflowTestAssertionsDirectory, workflowTestAssertionsFileName);
+
+const workflow = yaml.parse(fs.readFileSync(workflowFilePath, 'utf8'));
+const workflowJobs = parseWorkflowFile(workflow);
+
+const mockFileContent = getMockFileContent(workflowName, workflowJobs);
+const mockFilePath = path.join(workflowTestMocksDirectory, workflowTestMocksFileName);
+console.log(`Creating mock file ${mockFilePath}`);
+fs.writeFileSync(mockFilePath, mockFileContent);
+console.log(`Mock file ${mockFilePath} created`);
+
+const assertionsFileContent = getAssertionsFileContent(workflowName, workflowJobs);
+const assertionsFilePath = path.join(workflowTestAssertionsDirectory, workflowTestAssertionsFileName);
+console.log(`Creating assertions file ${assertionsFilePath}`);
+fs.writeFileSync(assertionsFilePath, assertionsFileContent);
+console.log(`Assertions file ${assertionsFilePath} created`);
+
+const testFileContent = getTestFileContent(workflowName, workflowJobs);
+const testFilePath = path.join(workflowTestsDirectory, workflowTestFileName);
+console.log(`Creating test file ${testFilePath}`);
+fs.writeFileSync(testFilePath, testFileContent);
+console.log(`Test file ${testFilePath} created`);
diff --git a/workflow_tests/utils/utils.js b/workflow_tests/utils/utils.js
new file mode 100644
index 000000000000..32e106cfb1de
--- /dev/null
+++ b/workflow_tests/utils/utils.js
@@ -0,0 +1,178 @@
+const yaml = require('yaml');
+const fs = require('fs');
+const path = require('path');
+
+function setUpActParams(act, event = null, eventOptions = null, secrets = null, githubToken = null, envVars = null, inputs = null) {
+    let updated_act = act;
+
+    if (event && eventOptions) {
+        // according to `Act` docs event data should be under the key with the event name (`[event]: eventOptions`), but
+        // for some event types this does not work (like `issues`), but providing the data on the JSON top level does,
+        // hence `...eventOptions` - this seems to cover all options
+        const eventData = {
+            [event]: eventOptions,
+            ...eventOptions,
+        };
+        updated_act = updated_act.setEvent(eventData);
+    }
+
+    if (secrets) {
+        Object.entries(secrets).forEach(([key, value]) => {
+            updated_act = updated_act.setSecret(key, value);
+        });
+    }
+
+    if (githubToken) {
+        updated_act = updated_act.setGithubToken(githubToken);
+    }
+
+    if (envVars) {
+        Object.entries(envVars).forEach(([key, value]) => {
+            updated_act = updated_act.setEnv(key, value);
+        });
+    }
+
+    if (inputs) {
+        Object.entries(inputs).forEach(([key, value]) => {
+            updated_act = updated_act.setInput(key, value);
+        });
+    }
+
+    return updated_act;
+}
+
+function createMockStep(name, message, job_id = null, inputs = null, in_envs = null, outputs = null, out_envs = null, isSuccessful = true, id = null) {
+    const mockStepName = name;
+    let mockWithCommand = 'echo [MOCK]';
+    if (job_id) {
+        mockWithCommand += ` [${job_id}]`;
+    }
+    mockWithCommand += ` ${message}`;
+    if (inputs) {
+        inputs.forEach((input) => {
+            mockWithCommand += `, ${input}="\${{ inputs.${input} && inputs.${input} || github.event.inputs.${input} }}"`;
+        });
+    }
+    if (in_envs) {
+        in_envs.forEach((env) => {
+            mockWithCommand += `, ${env}="\${{ env.${env} }}"`;
+        });
+    }
+    if (outputs) {
+        Object.entries(outputs).forEach(([key, value]) => {
+            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_OUTPUT"`;
+        });
+    }
+    if (out_envs) {
+        Object.entries(out_envs).forEach(([key, value]) => {
+            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_ENV"`;
+        });
+    }
+    if (!isSuccessful) {
+        mockWithCommand += '\nexit 1';
+    }
+    const mockStep = {
+        name: mockStepName,
+        mockWith: mockWithCommand,
+    };
+    if (id) {
+        mockStep.id = id;
+    }
+    return mockStep;
+}
+
+function createStepAssertion(name, isSuccessful = true, expectedOutput = null, jobId = null, message = null, inputs = null, envs = null) {
+    const stepName = `Main ${name}`;
+    const stepStatus = isSuccessful ? 0 : 1;
+    let stepOutput;
+    if (expectedOutput !== undefined && expectedOutput !== null) {
+        stepOutput = expectedOutput;
+    } else {
+        stepOutput = '[MOCK]';
+        if (jobId) {
+            stepOutput += ` [${jobId}]`;
+        }
+        if (message) {
+            stepOutput += ` ${message}`;
+        }
+        if (inputs) {
+            inputs.forEach((input) => {
+                stepOutput += `, ${input.key}=${input.value}`;
+            });
+        }
+        if (envs) {
+            envs.forEach((env) => {
+                stepOutput += `, ${env.key}=${env.value}`;
+            });
+        }
+    }
+    return {
+        name: stepName,
+        status: stepStatus,
+        output: stepOutput,
+    };
+}
+
+function setJobRunners(act, jobs, workflowPath) {
+    if (!act || !jobs || !workflowPath) {
+        return act;
+    }
+
+    const workflow = yaml.parse(fs.readFileSync(workflowPath, 'utf8'));
+    Object.entries(jobs).forEach(([jobId, runner]) => {
+        const job = workflow.jobs[jobId];
+        job['runs-on'] = runner;
+    });
+    fs.writeFileSync(workflowPath, yaml.stringify(workflow), 'utf8');
+    return act;
+}
+
+function deepCopy(originalObject) {
+    return JSON.parse(JSON.stringify(originalObject));
+}
+
+function getLogFilePath(workflowName, testName) {
+    const logsDir = path.resolve(__dirname, '..', 'logs');
+    if (!fs.existsSync(logsDir)) {
+        fs.mkdirSync(logsDir);
+    }
+    const workflowTestsLogDir = path.resolve(logsDir, workflowName);
+    if (!fs.existsSync(workflowTestsLogDir)) {
+        fs.mkdirSync(workflowTestsLogDir);
+    }
+    const cleanTestName = testName.replace(' ', '_').replace('-', '_').substr(0, 240);
+    return path.resolve(workflowTestsLogDir, `${cleanTestName}.log`);
+}
+
+function removeMockRepoDir() {
+    const mockDirRepo = path.resolve(__dirname, '..', '..', 'repo');
+    if (fs.existsSync(mockDirRepo)) {
+        fs.rmSync(mockDirRepo, {recursive: true, force: true});
+    }
+}
+
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'actions'),
+        dest: '.github/actions',
+    },
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'libs'),
+        dest: '.github/libs',
+    },
+    {
+        src: path.resolve(__dirname, '..', '..', '.github', 'scripts'),
+        dest: '.github/scripts',
+    },
+];
+
+module.exports = {
+    setUpActParams,
+    createMockStep,
+    createStepAssertion,
+    setJobRunners,
+    deepCopy,
+    getLogFilePath,
+    FILES_TO_COPY_INTO_TEST_REPO,
+    removeMockRepoDir,
+};
diff --git a/workflow_tests/validateGithubActions.test.js b/workflow_tests/validateGithubActions.test.js
new file mode 100644
index 000000000000..dfa5e9362ce7
--- /dev/null
+++ b/workflow_tests/validateGithubActions.test.js
@@ -0,0 +1,90 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/validateGithubActionsAssertions');
+const mocks = require('./mocks/validateGithubActionsMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'validateGithubActions.yml'),
+        dest: '.github/workflows/validateGithubActions.yml',
+    },
+];
+
+describe('test workflow validateGithubActions', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testValidateGithubActionsWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        it('executes verification', async () => {
+            const repoPath = mockGithub.repo.getPath('testValidateGithubActionsWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('validateGithubActions', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        it('executes verification', async () => {
+            const repoPath = mockGithub.repo.getPath('testValidateGithubActionsWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('validateGithubActions', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+    });
+});
diff --git a/workflow_tests/verifyPodfile.test.js b/workflow_tests/verifyPodfile.test.js
new file mode 100644
index 000000000000..de062af2a2c2
--- /dev/null
+++ b/workflow_tests/verifyPodfile.test.js
@@ -0,0 +1,133 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/verifyPodfileAssertions');
+const mocks = require('./mocks/verifyPodfileMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'verifyPodfile.yml'),
+        dest: '.github/workflows/verifyPodfile.yml',
+    },
+];
+
+describe('test workflow verifyPodfile', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+    const osbotifyActor = 'OSBotify';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testVerifyPodfileWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        it('executes workflow', async () => {
+            const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            it('does not execute workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyJobExecuted(result, false);
+            });
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        it('executes workflow', async () => {
+            const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+            const testMockSteps = {
+                verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifyJobExecuted(result);
+        });
+        describe('actor is OSBotify', () => {
+            it('does not execute workflow', async () => {
+                const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
+                const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
+                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+                act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
+                const testMockSteps = {
+                    verify: mocks.VERIFYPODFILE__VERIFY__STEP_MOCKS,
+                };
+                const result = await act.runEvent(event, {
+                    workflowFile: path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml'),
+                    mockSteps: testMockSteps,
+                    actor: osbotifyActor,
+                    logFile: utils.getLogFilePath('verifyPodfile', expect.getState().currentTestName),
+                });
+
+                assertions.assertVerifyJobExecuted(result, false);
+            });
+        });
+    });
+});
diff --git a/workflow_tests/verifySignedCommits.test.js b/workflow_tests/verifySignedCommits.test.js
new file mode 100644
index 000000000000..911208e91f4a
--- /dev/null
+++ b/workflow_tests/verifySignedCommits.test.js
@@ -0,0 +1,90 @@
+const path = require('path');
+const kieMockGithub = require('@kie/mock-github');
+const utils = require('./utils/utils');
+const assertions = require('./assertions/verifySignedCommitsAssertions');
+const mocks = require('./mocks/verifySignedCommitsMocks');
+const eAct = require('./utils/ExtendedAct');
+
+jest.setTimeout(90 * 1000);
+let mockGithub;
+const FILES_TO_COPY_INTO_TEST_REPO = [
+    ...utils.deepCopy(utils.FILES_TO_COPY_INTO_TEST_REPO),
+    {
+        src: path.resolve(__dirname, '..', '.github', 'workflows', 'verifySignedCommits.yml'),
+        dest: '.github/workflows/verifySignedCommits.yml',
+    },
+];
+
+describe('test workflow verifySignedCommits', () => {
+    const githubToken = 'dummy_github_token';
+    const actor = 'Dummy Actor';
+
+    beforeAll(async () => {
+        // in case of the tests being interrupted without cleanup the mock repo directory may be left behind
+        // which breaks the next test run, this removes any possible leftovers
+        utils.removeMockRepoDir();
+    });
+
+    beforeEach(async () => {
+        // create a local repository and copy required files
+        mockGithub = new kieMockGithub.MockGithub({
+            repo: {
+                testVerifySignedCommitsWorkflowRepo: {
+                    files: FILES_TO_COPY_INTO_TEST_REPO,
+                },
+            },
+        });
+
+        await mockGithub.setup();
+    });
+
+    afterEach(async () => {
+        await mockGithub.teardown();
+    });
+    describe('pull request opened', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'opened',
+        };
+        it('test stub', async () => {
+            const repoPath = mockGithub.repo.getPath('testVerifySignedCommitsWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifySignedCommits', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifySignedCommitsJobExecuted(result);
+        });
+    });
+    describe('pull request synchronized', () => {
+        const event = 'pull_request';
+        const eventOptions = {
+            action: 'synchronize',
+        };
+        it('test stub', async () => {
+            const repoPath = mockGithub.repo.getPath('testVerifySignedCommitsWorkflowRepo') || '';
+            const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml');
+            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
+            const testMockSteps = {
+                verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
+            };
+            const result = await act.runEvent(event, {
+                workflowFile: path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml'),
+                mockSteps: testMockSteps,
+                actor,
+                logFile: utils.getLogFilePath('verifySignedCommits', expect.getState().currentTestName),
+            });
+
+            assertions.assertVerifySignedCommitsJobExecuted(result);
+        });
+    });
+});